diff options
| author | Andrew Elble <aweits@rit.edu> | 2015-02-09 12:53:04 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2015-02-10 05:14:56 -0500 |
| commit | 278702074ff77b1a3fa2061267997095959f5e2c (patch) | |
| tree | dd20e317ed156bdde9b74c168bd7b2f4609e42d3 /fs | |
| parent | 7456a37d55ced3928fd96615fde0dd739985f0dc (diff) | |
GFS2: Fix crash during ACL deletion in acl max entry check in gfs2_set_acl()
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>
Diffstat (limited to 'fs')
| -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) | |||
| 73 | 73 | ||
| 74 | BUG_ON(name == NULL); | 74 | BUG_ON(name == NULL); |
| 75 | 75 | ||
| 76 | if (acl->a_count > GFS2_ACL_MAX_ENTRIES(GFS2_SB(inode))) | 76 | if (acl && acl->a_count > GFS2_ACL_MAX_ENTRIES(GFS2_SB(inode))) |
| 77 | return -E2BIG; | 77 | return -E2BIG; |
| 78 | 78 | ||
| 79 | if (type == ACL_TYPE_ACCESS) { | 79 | if (type == ACL_TYPE_ACCESS) { |