summaryrefslogtreecommitdiffstats
path: root/fs/posix_acl.c
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2014-02-14 12:05:49 +0300
committerSteven Whitehouse <swhiteho@redhat.com>2014-02-25 10:01:09 +0000
commit47ba9734403770a4c5e685b01f0a72b835dd4fff (patch)
treeac4badd94ef5153496a4159e1bc6614333771d90 /fs/posix_acl.c
parent022ef4feed0c648aeb72d0c8ad06d266de08f525 (diff)
downloadlinux-stable-47ba9734403770a4c5e685b01f0a72b835dd4fff.tar.gz
linux-stable-47ba9734403770a4c5e685b01f0a72b835dd4fff.tar.bz2
linux-stable-47ba9734403770a4c5e685b01f0a72b835dd4fff.zip
fs: NULL dereference in posix_acl_to_xattr()
This patch moves the dereference of "buffer" after the check for NULL. The only place which passes a NULL parameter is gfs2_set_acl(). Cc: stable <stable@vger.kernel.org> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/posix_acl.c')
-rw-r--r--fs/posix_acl.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/posix_acl.c b/fs/posix_acl.c
index 38bae5a0ea25..202b84fd3310 100644
--- a/fs/posix_acl.c
+++ b/fs/posix_acl.c
@@ -717,7 +717,7 @@ posix_acl_to_xattr(struct user_namespace *user_ns, const struct posix_acl *acl,
void *buffer, size_t size)
{
posix_acl_xattr_header *ext_acl = (posix_acl_xattr_header *)buffer;
- posix_acl_xattr_entry *ext_entry = ext_acl->a_entries;
+ posix_acl_xattr_entry *ext_entry;
int real_size, n;
real_size = posix_acl_xattr_size(acl->a_count);
@@ -725,7 +725,8 @@ posix_acl_to_xattr(struct user_namespace *user_ns, const struct posix_acl *acl,
return real_size;
if (real_size > size)
return -ERANGE;
-
+
+ ext_entry = ext_acl->a_entries;
ext_acl->a_version = cpu_to_le32(POSIX_ACL_XATTR_VERSION);
for (n=0; n < acl->a_count; n++, ext_entry++) {