From: J. Bruce Fields <bfields@redhat.com>
Date: Tue, 26 Mar 2013 18:11:13 +0000 (-0400)
Subject: nfsd4: reject "negative" acl lengths
X-Git-Tag: v3.2.43~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=509d8d1dcefb35111b3f1e24f56be7d956cef439;p=thirdparty%2Fkernel%2Fstable.git

nfsd4: reject "negative" acl lengths

commit 64a817cfbded8674f345d1117b117f942a351a69 upstream.

Since we only enforce an upper bound, not a lower bound, a "negative"
length can get through here.

The symptom seen was a warning when we attempt to a kmalloc with an
excessive size.

Reported-by: Toralf Förster <toralf.foerster@gmx.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 800c215c95a54..24afa96de4fa7 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -280,7 +280,7 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
 		iattr->ia_valid |= ATTR_SIZE;
 	}
 	if (bmval[0] & FATTR4_WORD0_ACL) {
-		int nace;
+		u32 nace;
 		struct nfs4_ace *ace;
 
 		READ_BUF(4); len += 4;