aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2013-03-26 14:11:13 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-05 10:16:51 -0700
commit7e36f505caf7882b6cc89ecedcd7f26749ef917a (patch)
tree653d14c0ec447d960773f2056923c7f0c3fc6eaf
parent582b4c3dc62284aec367a3f4f74ce8101303e9c4 (diff)
downloadlinux-linaro-stable-7e36f505caf7882b6cc89ecedcd7f26749ef917a.tar.gz
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/nfsd/nfs4xdr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index ecdd18ab3560..59ac3f41cc9e 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -262,7 +262,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;