From: J. Bruce Fields <bfields@citi.umich.edu>
Date: Fri, 29 Aug 2008 23:18:45 +0000 (-0400)
Subject: nfsd: fix buffer overrun decoding NFSv4 acl
X-Git-Tag: v2.6.27-rc6~83^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=91b80969ba466ba4b915a4a1d03add8c297add3f;p=linux-2.6-omap-h63xx.git

nfsd: fix buffer overrun decoding NFSv4 acl

The array we kmalloc() here is not large enough.

Thanks to Johann Dahm and David Richter for bug report and testing.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Cc: David Richter <richterd@citi.umich.edu>
Tested-by: Johann Dahm <jdahm@umich.edu>
---

diff --git a/fs/nfsd/nfs4acl.c b/fs/nfsd/nfs4acl.c
index b6ed38380ab..54b8b4140c8 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;