Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed92d8c1 authored by Weston Andros Adamson's avatar Weston Andros Adamson Committed by Anna Schumaker
Browse files

NFSv4: fix getacl ERANGE for some ACL buffer sizes 



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: default avatarWeston Andros Adamson <dros@primarydata.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 6682c14b

fs/nfs/nfs4proc.c

+2 −6
Original line number Diff line number Diff line
@@ -4954,7 +4954,7 @@ static void nfs4_write_cached_acl(struct inode *inode, struct page **pages, size 
 */

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,
@@ -4968,13 +4968,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;