From: Weston Andros Adamson Date: Thu, 23 Feb 2017 19:54:21 +0000 (-0500) Subject: NFSv4: fix getacl ERANGE for some ACL buffer sizes X-Git-Tag: Ubuntu-4.10.0-19.21~548 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=896bf48b343fb123452e27fd01965757152c7ae2;p=mirror_ubuntu-artful-kernel.git NFSv4: fix getacl ERANGE for some ACL buffer sizes BugLink: http://bugs.launchpad.net/bugs/1672544 commit ed92d8c137b7794c2c2aa14479298b9885967607 upstream. We're not taking into account that the space needed for the (variable length) attr bitmap, with the result that we'd sometimes get a spurious ERANGE when the ACL data got close to the end of a page. Just add in an extra page to make sure. Signed-off-by: Weston Andros Adamson Signed-off-by: J. Bruce Fields Signed-off-by: Anna Schumaker Signed-off-by: Greg Kroah-Hartman Signed-off-by: Tim Gardner --- diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index fa4f26edc0ba..37bcd887f742 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -5065,7 +5065,7 @@ out: */ static ssize_t __nfs4_get_acl_uncached(struct inode *inode, void *buf, size_t buflen) { - struct page *pages[NFS4ACL_MAXPAGES] = {NULL, }; + struct page *pages[NFS4ACL_MAXPAGES + 1] = {NULL, }; struct nfs_getaclargs args = { .fh = NFS_FH(inode), .acl_pages = pages, @@ -5079,13 +5079,9 @@ static ssize_t __nfs4_get_acl_uncached(struct inode *inode, void *buf, size_t bu .rpc_argp = &args, .rpc_resp = &res, }; - unsigned int npages = DIV_ROUND_UP(buflen, PAGE_SIZE); + unsigned int npages = DIV_ROUND_UP(buflen, PAGE_SIZE) + 1; int ret = -ENOMEM, i; - /* As long as we're doing a round trip to the server anyway, - * let's be prepared for a page of acl data. */ - if (npages == 0) - npages = 1; if (npages > ARRAY_SIZE(pages)) return -ERANGE;