diff options
author | Xi Wang <xi.wang@gmail.com> | 2011-12-12 16:55:52 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-12 14:35:55 -0500 |
commit | 6e474bc4d5c0d94c070a18901e00ff33de0c1be1 (patch) | |
tree | 88bd52502d438e5046c10d7f4c99a1454d06324a | |
parent | 68f760945cb704f4a9d0ae7c4abc9e41ca30aa91 (diff) |
xfs: fix acl count validation in xfs_acl_from_disk()
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>
-rw-r--r-- | fs/xfs/linux-2.6/xfs_acl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_acl.c b/fs/xfs/linux-2.6/xfs_acl.c index 4b9fb915d44..f86e0348786 100644 --- a/fs/xfs/linux-2.6/xfs_acl.c +++ b/fs/xfs/linux-2.6/xfs_acl.c | |||
@@ -39,7 +39,7 @@ xfs_acl_from_disk(struct xfs_acl *aclp) | |||
39 | struct posix_acl_entry *acl_e; | 39 | struct posix_acl_entry *acl_e; |
40 | struct posix_acl *acl; | 40 | struct posix_acl *acl; |
41 | struct xfs_acl_entry *ace; | 41 | struct xfs_acl_entry *ace; |
42 | int count, i; | 42 | unsigned int count, i; |
43 | 43 | ||
44 | count = be32_to_cpu(aclp->acl_cnt); | 44 | count = be32_to_cpu(aclp->acl_cnt); |
45 | if (count > XFS_ACL_MAX_ENTRIES) | 45 | if (count > XFS_ACL_MAX_ENTRIES) |