Merge branch 'for-3.9' of git://linux-nfs.org/~bfields/linux

f8e9248d · Linus Torvalds <[email protected]> · 2013-04-02 07:56:20 -07:00

Pull nfsd bugfix from J Bruce Fields:
 "An xdr decoding error--thanks, Toralf Förster, and Trinity!"

* 'for-3.9' of git://linux-nfs.org/~bfields/linux:
  nfsd4: reject "negative" acl lengths

Commit: f8e9248dbb2bddfaed86a14254b7ca2409ef68ff
Parents: fefcdbe4 · 64a817cf

Merge commit. Changes below are compared with the first parent: fefcdbe4.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
fs/nfsd/nfs4xdr.c	modified	+1	−1	View file

fs/nfsd/nfs4xdr.c

View file

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 0116886..a272007 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -264,7 +264,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;