diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-02 21:58:11 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-02 21:58:11 +0400 |
commit | e77295dc9e6b52281ae85af4068f13752524e9f4 (patch) | |
tree | fca6b723f6c91f2af79b28f05c05e114720fbe66 /fs/nfsd/nfs4acl.c | |
parent | 1136cf11066a32d4ac2a476dac302858d763703d (diff) | |
parent | 91b80969ba466ba4b915a4a1d03add8c297add3f (diff) | |
download | linux-e77295dc9e6b52281ae85af4068f13752524e9f4.tar.xz |
Merge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.27' of git://linux-nfs.org/~bfields/linux:
nfsd: fix buffer overrun decoding NFSv4 acl
sunrpc: fix possible overrun on read of /proc/sys/sunrpc/transports
nfsd: fix compound state allocation error handling
svcrdma: Fix race between svc_rdma_recvfrom thread and the dto_tasklet
Diffstat (limited to 'fs/nfsd/nfs4acl.c')
-rw-r--r-- | fs/nfsd/nfs4acl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4acl.c b/fs/nfsd/nfs4acl.c index b6ed38380ab8..54b8b4140c8f 100644 --- a/fs/nfsd/nfs4acl.c +++ b/fs/nfsd/nfs4acl.c @@ -443,7 +443,7 @@ init_state(struct posix_acl_state *state, int cnt) * enough space for either: */ alloc = sizeof(struct posix_ace_state_array) - + cnt*sizeof(struct posix_ace_state); + + cnt*sizeof(struct posix_user_ace_state); state->users = kzalloc(alloc, GFP_KERNEL); if (!state->users) return -ENOMEM; |