aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Elble <aweits@rit.edu>2015-02-09 12:53:04 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-18 14:11:11 +0100
commit3449e4060ca5378d21a1536729797314ae6aa405 (patch)
treebbb80a51ea654a97dd2ff32f5b12ca1602e3e4bb
parent2ac80c2fd4214e398b010ff52683924de81c88f5 (diff)
GFS2: Fix crash during ACL deletion in acl max entry check in gfs2_set_acl()
commit 278702074ff77b1a3fa2061267997095959f5e2c upstream. Fixes: e01580bf9e ("gfs2: use generic posix ACL infrastructure") Reported-by: Eric Meddaugh <etmsys@rit.edu> Tested-by: Eric Meddaugh <etmsys@rit.edu> Signed-off-by: Andrew Elble <aweits@rit.edu> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/gfs2/acl.c2
1 files changed, 1 insertions, 1 deletions
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) {