git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'core-urgent-for-linus' and 'irq-urgent-for-linus' of git://git.kernel...
[pandora-kernel.git]
/
fs
/
xfs
/
xfs_acl.c
diff --git
a/fs/xfs/xfs_acl.c
b/fs/xfs/xfs_acl.c
index
b6c4b37
..
76e4266
100644
(file)
--- 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)