diff options
| author | Andrew Elble <aweits@rit.edu> | 2015-02-09 12:53:04 -0500 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-03-23 21:02:52 -0400 |
| commit | 46b6f104d8419a7c468c91b7e6f5289f230c4826 (patch) | |
| tree | 748f3c99d6675606f838e80ae1db352ff006b4a9 | |
| parent | c0064e10c9085a79a44ea7110c0bde081095c193 (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.c | 2 |
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) { |