| From 278702074ff77b1a3fa2061267997095959f5e2c Mon Sep 17 00:00:00 2001 |
| From: Andrew Elble <aweits@rit.edu> |
| Date: Mon, 9 Feb 2015 12:53:04 -0500 |
| Subject: GFS2: Fix crash during ACL deletion in acl max entry check in gfs2_set_acl() |
| |
| From: Andrew Elble <aweits@rit.edu> |
| |
| 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> |
| |
| --- |
| fs/gfs2/acl.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/fs/gfs2/acl.c |
| +++ b/fs/gfs2/acl.c |
| @@ -73,7 +73,7 @@ int gfs2_set_acl(struct inode *inode, st |
| |
| 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) { |
