Commit f8e9248d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents fefcdbe4 64a817cf

fs/nfsd/nfs4xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -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;