diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2011-03-17 17:07:20 (GMT) |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2011-03-17 17:07:25 (GMT) |
| commit | cf507b6f8ebae89c0e7bbd00abc6d8887c9035b1 (patch) | |
| tree | 834a5c5bbd63aed0756d47978679d230d5dedec4 /fs/nfsd/nfs4callback.c | |
| parent | 9ae78bcc000168251f893b1bf92a848308187695 (diff) | |
| parent | 3ec07aa9522e3d5e9d5ede7bef946756e623a0a0 (diff) | |
| download | linux-cf507b6f8ebae89c0e7bbd00abc6d8887c9035b1.tar.xz | |
Merge create_session decoding fix into for-2.6.39
This needs a further fixup!
Diffstat (limited to 'fs/nfsd/nfs4callback.c')
| -rw-r--r-- | fs/nfsd/nfs4callback.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index cde36cb..02eb4ed 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c @@ -432,7 +432,7 @@ static int decode_cb_sequence4resok(struct xdr_stream *xdr, * If the server returns different values for sessionID, slotID or * sequence number, the server is looney tunes. */ - p = xdr_inline_decode(xdr, NFS4_MAX_SESSIONID_LEN + 4 + 4); + p = xdr_inline_decode(xdr, NFS4_MAX_SESSIONID_LEN + 4 + 4 + 4 + 4); if (unlikely(p == NULL)) goto out_overflow; memcpy(id.data, p, NFS4_MAX_SESSIONID_LEN); |