diff options
| author | J. Bruce Fields <bfields@fieldses.org> | 2009-12-03 08:10:17 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-12-03 08:10:17 -0500 |
| commit | d327cf7449e6fd5cbac784c641770e9366faa386 (patch) | |
| tree | 3270b042c6346a86973fc9a7d89cbfff9493d75b /fs/nfs/nfs4xdr.c | |
| parent | f0380f3d16df8f9e2fcd1d8c16fb0d94370bea99 (diff) | |
Re: acl trouble after upgrading ubuntu
Subject: [PATCH] nfs: fix acl decoding
Commit 28f566942c6b1d929f5e240e69e7081b77b238d3 "NFS: use dynamically
computed compound_hdr.replen for xdr_inline_pages offset" accidentally
changed the amount of space to allow for the acl reply, resulting in an
IO error on attempts to get an acl.
Reported-by: Paul Rudin <paul@rudin.co.uk>
Cc: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4xdr.c')
| -rw-r--r-- | fs/nfs/nfs4xdr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index 20b4e30e6c82..3a71b40a990a 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c | |||
| @@ -2096,7 +2096,7 @@ nfs4_xdr_enc_getacl(struct rpc_rqst *req, __be32 *p, | |||
| 2096 | encode_compound_hdr(&xdr, req, &hdr); | 2096 | encode_compound_hdr(&xdr, req, &hdr); |
| 2097 | encode_sequence(&xdr, &args->seq_args, &hdr); | 2097 | encode_sequence(&xdr, &args->seq_args, &hdr); |
| 2098 | encode_putfh(&xdr, args->fh, &hdr); | 2098 | encode_putfh(&xdr, args->fh, &hdr); |
| 2099 | replen = hdr.replen + nfs4_fattr_bitmap_maxsz + 1; | 2099 | replen = hdr.replen + op_decode_hdr_maxsz + nfs4_fattr_bitmap_maxsz + 1; |
| 2100 | encode_getattr_two(&xdr, FATTR4_WORD0_ACL, 0, &hdr); | 2100 | encode_getattr_two(&xdr, FATTR4_WORD0_ACL, 0, &hdr); |
| 2101 | 2101 | ||
| 2102 | xdr_inline_pages(&req->rq_rcv_buf, replen << 2, | 2102 | xdr_inline_pages(&req->rq_rcv_buf, replen << 2, |