path: root/net
diff options
authorAndy Adamson <>2011-12-07 11:55:27 -0500
committerGreg Kroah-Hartman <>2012-01-18 07:31:55 -0800
commitbd689a8cdbfe4cf5182f01aa93e4ba3fadf1f11c (patch)
tree75453fc4c5cc7e598a35a05dc7f3f5b88e0cdfa1 /net
parent6ab1a5d77456d333674ed3b9a2bd3c29715965b6 (diff)
NFSv4: include bitmap in nfsv4 get acl data
commit bf118a342f10dafe44b14451a1392c3254629a1f upstream. The NFSv4 bitmap size is unbounded: a server can return an arbitrary sized bitmap in an FATTR4_WORD0_ACL request. Replace using the nfs4_fattr_bitmap_maxsz as a guess to the maximum bitmask returned by a server with the inclusion of the bitmap (xdr length plus bitmasks) and the acl data xdr length to the (cached) acl page data. This is a general solution to commit e5012d1f "NFSv4.1: update nfs4_fattr_bitmap_maxsz" and fixes hitting a BUG_ON in xdr_shrink_bufhead when getting ACLs. Fix a bug in decode_getacl that returned -EINVAL on ACLs > page when getxattr was called with a NULL buffer, preventing ACL > PAGE_SIZE from being retrieved. Signed-off-by: Andy Adamson <> Signed-off-by: Trond Myklebust <> Signed-off-by: Greg Kroah-Hartman <>
Diffstat (limited to 'net')
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
index 277ebd4bf095..593f4c605305 100644
--- a/net/sunrpc/xdr.c
+++ b/net/sunrpc/xdr.c
@@ -296,7 +296,7 @@ _copy_to_pages(struct page **pages, size_t pgbase, const char *p, size_t len)
* Copies data into an arbitrary memory location from an array of pages
* The copy is assumed to be non-overlapping.
-static void
_copy_from_pages(char *p, struct page **pages, size_t pgbase, size_t len)
struct page **pgfrom;
@@ -324,6 +324,7 @@ _copy_from_pages(char *p, struct page **pages, size_t pgbase, size_t len)
} while ((len -= copy) != 0);
* xdr_shrink_bufhead