]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
xfs: fix acl count validation in xfs_acl_from_disk()
authorXi Wang <xi.wang@gmail.com>
Mon, 12 Dec 2011 21:55:52 +0000 (21:55 +0000)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 12 Jan 2012 19:40:13 +0000 (11:40 -0800)
commit 093019cf1b18dd31b2c3b77acce4e000e2cbc9ce upstream.

Commit fa8b18ed didn't prevent the integer overflow and possible
memory corruption.  "count" can go negative and bypass the check.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ben Myers <bpm@sgi.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
fs/xfs/linux-2.6/xfs_acl.c

index 03aec610b3fcaf3dce00aceb3982b30fa30a8847..ad60d619312d0d145091d7950dc1c949bb0f9b15 100644 (file)
@@ -37,7 +37,7 @@ xfs_acl_from_disk(struct xfs_acl *aclp)
        struct posix_acl_entry *acl_e;
        struct posix_acl *acl;
        struct xfs_acl_entry *ace;
-       int count, i;
+       unsigned int count, i;
 
        count = be32_to_cpu(aclp->acl_cnt);
        if (count > XFS_ACL_MAX_ENTRIES)