[3.16.y-ckt stable] Patch "GFS2: Fix crash during ACL deletion in acl max entry check in gfs2_set_acl()" has been added to staging queue

[Luis Henriques]

This is a note to let you know that I have just added a patch titled

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

to the linux-3.16.y-queue branch of the 3.16.y-ckt extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.16.y-queue

This patch is scheduled to be released in version 3.16.7-ckt8.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.16.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

>From a119cdf4f560b0ce76d081047ea3338068e98e1a Mon Sep 17 00:00:00 2001
From: Andrew Elble <aweits at 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()

commit 278702074ff77b1a3fa2061267997095959f5e2c upstream.

Fixes: e01580bf9e ("gfs2: use generic posix ACL infrastructure")
Reported-by: Eric Meddaugh <etmsys at rit.edu>
Tested-by: Eric Meddaugh <etmsys at rit.edu>
Signed-off-by: Andrew Elble <aweits at rit.edu>
Signed-off-by: Steven Whitehouse <swhiteho at redhat.com>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 fs/gfs2/acl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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) {