[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20100806185834.089377858@clark.site>
Date: Fri, 06 Aug 2010 11:56:58 -0700
From: Greg KH <gregkh@...e.de>
To: linux-kernel@...r.kernel.org, stable@...nel.org
Cc: stable-review@...nel.org, torvalds@...ux-foundation.org,
akpm@...ux-foundation.org, alan@...rguk.ukuu.org.uk,
Benny Halevy <bhalevy@...asas.com>,
"J. Bruce Fields" <bfields@...i.umich.edu>,
Trond Myklebust <Trond.Myklebust@...app.com>,
Jeremy Kerr <jeremy.kerr@...onical.com>
Subject: [03/34] Re: acl trouble after upgrading ubuntu
2.6.32-stable review patch. If anyone has any objections, please let us know.
------------------
From: J. Bruce Fields <bfields@...ldses.org>
commit d327cf7449e6fd5cbac784c641770e9366faa386 upstream.
Subject: [03/34] 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@...in.co.uk>
Cc: Benny Halevy <bhalevy@...asas.com>
Signed-off-by: J. Bruce Fields <bfields@...i.umich.edu>
Signed-off-by: Trond Myklebust <Trond.Myklebust@...app.com>
Cc: Jeremy Kerr <jeremy.kerr@...onical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@...e.de>
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -2096,7 +2096,7 @@ nfs4_xdr_enc_getacl(struct rpc_rqst *req, __be32 *p,
encode_compound_hdr(&xdr, req, &hdr);
encode_sequence(&xdr, &args->seq_args, &hdr);
encode_putfh(&xdr, args->fh, &hdr);
- replen = hdr.replen + nfs4_fattr_bitmap_maxsz + 1;
+ replen = hdr.replen + op_decode_hdr_maxsz + nfs4_fattr_bitmap_maxsz + 1;
encode_getattr_two(&xdr, FATTR4_WORD0_ACL, 0, &hdr);
xdr_inline_pages(&req->rq_rcv_buf, replen << 2,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists