[PATCH 3.16.y-ckt 155/183] GFS2: Fix crash during ACL deletion in acl max entry check in gfs2_set_acl()
Luis Henriques
luis.henriques at canonical.com
Fri Mar 6 09:57:26 UTC 2015
3.16.7-ckt8 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Elble <aweits at rit.edu>
commit 278702074ff77b1a3fa2061267997095959f5e2c upstream.
Fixes: e01580bf9e ("gfs2: use generic posix ACL infrastructure")
Reported-by: Eric Meddaugh <etmsys at rit.edu>
Tested-by: Eric Meddaugh <etmsys at rit.edu>
Signed-off-by: Andrew Elble <aweits at rit.edu>
Signed-off-by: Steven Whitehouse <swhiteho at redhat.com>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
fs/gfs2/acl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/gfs2/acl.c b/fs/gfs2/acl.c
index 3088e2a38e30..7b3143064af1 100644
--- a/fs/gfs2/acl.c
+++ b/fs/gfs2/acl.c
@@ -73,7 +73,7 @@ int gfs2_set_acl(struct inode *inode, struct posix_acl *acl, int type)
BUG_ON(name == NULL);
- if (acl->a_count > GFS2_ACL_MAX_ENTRIES(GFS2_SB(inode)))
+ if (acl && acl->a_count > GFS2_ACL_MAX_ENTRIES(GFS2_SB(inode)))
return -E2BIG;
if (type == ACL_TYPE_ACCESS) {
More information about the kernel-team
mailing list