diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-02 10:56:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-02 10:56:20 -0400 |
| commit | f8e9248dbb2bddfaed86a14254b7ca2409ef68ff (patch) | |
| tree | 1056fbdc4d31b3d7aa459bb7f32f2b3be5086b22 /fs | |
| parent | fefcdbe4accadc7b9fac67066762d11f0e36d173 (diff) | |
| parent | 64a817cfbded8674f345d1117b117f942a351a69 (diff) | |
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
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfsd/nfs4xdr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 01168865dd37..a2720071f282 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c | |||
| @@ -264,7 +264,7 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval, | |||
| 264 | iattr->ia_valid |= ATTR_SIZE; | 264 | iattr->ia_valid |= ATTR_SIZE; |
| 265 | } | 265 | } |
| 266 | if (bmval[0] & FATTR4_WORD0_ACL) { | 266 | if (bmval[0] & FATTR4_WORD0_ACL) { |
| 267 | int nace; | 267 | u32 nace; |
| 268 | struct nfs4_ace *ace; | 268 | struct nfs4_ace *ace; |
| 269 | 269 | ||
| 270 | READ_BUF(4); len += 4; | 270 | READ_BUF(4); len += 4; |