diff options
| author | Andrew Elble <aweits@rit.edu> | 2015-02-09 20:53:04 +0300 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-03-02 18:04:42 +0300 |
| commit | 9e2feaeb22f528d655b49f646cc2153eeefc4604 (patch) | |
| tree | 4457b04f7bbeb12d36748ae9c5c4f4f69ac811ea /fs/gfs2 | |
| parent | 3a87ac142dd7465a895a3bd89b402f23da6c6bd2 (diff) | |
| download | linux-9e2feaeb22f528d655b49f646cc2153eeefc4604.tar.xz | |
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: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'fs/gfs2')
| -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) { |