Skip to contentSkip to conversation

Fix crash during ACL deletion in acl max entry check in gfs2_set_acl()

PATCH New Andrew Elble 2 participants 2 messages Feb 9, 2015 – Feb 10, 2015 GFS2 file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix crash during ACL deletion in acl max entry check in gfs2_set_acl()

Fixes e01580bf9e ("gfs2: use generic posix ACL infrastructure")
---
 fs/gfs2/acl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/gfs2/acl.c +1 -1
index 3088e2a..7b31430 100644
@@ -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) {
Signature · 1 line
1.9.2
#1 lore raw

PATCH 1/1 Fix crash during ACL deletion in acl max entry check in gfs2_set_acl()

Hi,

Now in the -nmw git tree. Thanks,

Steve.

Quoted 21 lines · Andrew Elble
Fixes e01580bf9e ("gfs2: use generic posix ACL infrastructure")
---
  fs/gfs2/acl.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
fs/gfs2/acl.c +1 -1
index 3088e2a..7b31430 100644
@@ -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) {