OSDN Git Service

GFS2: Fix crash during ACL deletion in acl max entry check in gfs2_set_acl()
authorAndrew Elble <aweits@rit.edu>
Mon, 9 Feb 2015 17:53:04 +0000 (12:53 -0500)
committerSteven Whitehouse <swhiteho@redhat.com>
Tue, 10 Feb 2015 10:14:56 +0000 (10:14 +0000)
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>
fs/gfs2/acl.c

index 3088e2a..7b31430 100644 (file)
@@ -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) {