diff options
| author | Kinglong Mee <kinglongmee@gmail.com> | 2013-12-09 19:31:21 +0800 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2014-01-03 13:44:12 -0500 |
| commit | a9f7b4a06c9704fa3cfe0b0601347e03289a7407 (patch) | |
| tree | 271ac8b5e4b40e0b46cdc0634a5637081d33802d | |
| parent | b9b284df6c2013aeceb974055426f35e03ac43fc (diff) | |
| download | op-kernel-dev-a9f7b4a06c9704fa3cfe0b0601347e03289a7407.zip op-kernel-dev-a9f7b4a06c9704fa3cfe0b0601347e03289a7407.tar.gz | |
nfsd: clean up an xdr reserved space calculation
We should use XDR_LEN to calculate reserved space in case the oid is not
a multiple of 4.
RESERVE_SPACE actually rounds up for us, but it's probably better to be
careful here.
Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
| -rw-r--r-- | fs/nfsd/nfs4xdr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 1dface0..dbd64a9 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -3263,7 +3263,7 @@ nfsd4_do_encode_secinfo(struct nfsd4_compoundres *resp, if (rpcauth_get_gssinfo(pf, &info) == 0) { supported++; - RESERVE_SPACE(4 + 4 + info.oid.len + 4 + 4); + RESERVE_SPACE(4 + 4 + XDR_LEN(info.oid.len) + 4 + 4); WRITE32(RPC_AUTH_GSS); WRITE32(info.oid.len); WRITEMEM(info.oid.data, info.oid.len); |
