diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-10 17:00:44 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-10 17:00:44 -0500 |
| commit | bef6e7e76868ab454d5e83635a4a7a1961c74fb5 (patch) | |
| tree | 1a7417b9dde942cc71f87c02688c6ac6b0e57a72 /fs/nfsd/nfs4callback.c | |
| parent | dcbcdf22f500ac6e4ec06485341024739b9dc241 (diff) | |
| parent | 9179746652faf0aba07b8b7f770dcf29892a24c6 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
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 cde36cb0f348..02eb4edf0ece 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c | |||
| @@ -432,7 +432,7 @@ static int decode_cb_sequence4resok(struct xdr_stream *xdr, | |||
| 432 | * If the server returns different values for sessionID, slotID or | 432 | * If the server returns different values for sessionID, slotID or |
| 433 | * sequence number, the server is looney tunes. | 433 | * sequence number, the server is looney tunes. |
| 434 | */ | 434 | */ |
| 435 | p = xdr_inline_decode(xdr, NFS4_MAX_SESSIONID_LEN + 4 + 4); | 435 | p = xdr_inline_decode(xdr, NFS4_MAX_SESSIONID_LEN + 4 + 4 + 4 + 4); |
| 436 | if (unlikely(p == NULL)) | 436 | if (unlikely(p == NULL)) |
| 437 | goto out_overflow; | 437 | goto out_overflow; |
| 438 | memcpy(id.data, p, NFS4_MAX_SESSIONID_LEN); | 438 | memcpy(id.data, p, NFS4_MAX_SESSIONID_LEN); |