summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2011-11-20 16:35:32 +0100
committerBen Myers <bpm@sgi.com>2011-11-29 05:14:24 +0100
commitfa8b18edd752a8b4e9d1ee2cd615b82c93cf8bba (patch)
tree9765979df5cd3da5f7e7c54b6fcf47ae26486ec9 /fs
parentMAINTAINERS: update XFS maintainer entry (diff)
downloadlinux-fa8b18edd752a8b4e9d1ee2cd615b82c93cf8bba.tar.xz
linux-fa8b18edd752a8b4e9d1ee2cd615b82c93cf8bba.zip
xfs: validate acl count
This prevents in-memory corruption and possible panics if the on-disk ACL is badly corrupted. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/xfs/xfs_acl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/xfs/xfs_acl.c b/fs/xfs/xfs_acl.c
index b6c4b3795c4a..76e4266d2e7e 100644
--- a/fs/xfs/xfs_acl.c
+++ b/fs/xfs/xfs_acl.c
@@ -42,6 +42,8 @@ xfs_acl_from_disk(struct xfs_acl *aclp)
int count, i;
count = be32_to_cpu(aclp->acl_cnt);
+ if (count > XFS_ACL_MAX_ENTRIES)
+ return ERR_PTR(-EFSCORRUPTED);
acl = posix_acl_alloc(count, GFP_KERNEL);
if (!acl)