From patchwork Wed Jan 18 11:28:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [maverick, maverick/ti-omap4, natty, natty/ti-omap4, CVE, 1/2] xfs: validate acl count Date: Wed, 18 Jan 2012 01:28:29 -0000 From: Andy Whitcroft X-Patchwork-Id: 136592 Message-Id: <1326886110-1911-2-git-send-email-apw@canonical.com> To: kernel-team@lists.ubuntu.com Cc: Andy Whitcroft From: Christoph Hellwig This prevents in-memory corruption and possible panics if the on-disk ACL is badly corrupted. Signed-off-by: Christoph Hellwig Signed-off-by: Ben Myers (cherry-picked from commit fa8b18edd752a8b4e9d1ee2cd615b82c93cf8bba) CVE-2012-0038 BugLink: http://bugs.launchpad.net/bugs/917706 Signed-off-by: Andy Whitcroft --- fs/xfs/linux-2.6/xfs_acl.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/fs/xfs/linux-2.6/xfs_acl.c b/fs/xfs/linux-2.6/xfs_acl.c index 9f769b5..46556ee 100644 --- a/fs/xfs/linux-2.6/xfs_acl.c +++ b/fs/xfs/linux-2.6/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)