aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorakpm@osdl.org <akpm@osdl.org>2005-04-16 18:24:00 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-16 18:24:00 -0400
commite493073d8d053429fbb42331b57a95dd0d61cadb (patch)
treec4d697372f6c2f2e2f2548f75c1dbb5b821ab805 /fs
parent81ddef77bb774e771db8588b937665cd38f40cee (diff)
[PATCH] Fix acl Oops
) From: Andreas Gruenbacher <agruen@suse.de> ext[23]_get_acl will return an error when reading the attribute fails or out-of-memory occurs. Catch this case. Signed-off-by: Andreas Gruenbacher <agruen@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext2/acl.c2
-rw-r--r--fs/ext3/acl.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/fs/ext2/acl.c b/fs/ext2/acl.c
index 8369ee8d28c4..25f4a64fd6bc 100644
--- a/fs/ext2/acl.c
+++ b/fs/ext2/acl.c
@@ -283,6 +283,8 @@ ext2_check_acl(struct inode *inode, int mask)
283{ 283{
284 struct posix_acl *acl = ext2_get_acl(inode, ACL_TYPE_ACCESS); 284 struct posix_acl *acl = ext2_get_acl(inode, ACL_TYPE_ACCESS);
285 285
286 if (IS_ERR(acl))
287 return PTR_ERR(acl);
286 if (acl) { 288 if (acl) {
287 int error = posix_acl_permission(inode, acl, mask); 289 int error = posix_acl_permission(inode, acl, mask);
288 posix_acl_release(acl); 290 posix_acl_release(acl);
diff --git a/fs/ext3/acl.c b/fs/ext3/acl.c
index 328592c3a956..638c13a26c03 100644
--- a/fs/ext3/acl.c
+++ b/fs/ext3/acl.c
@@ -286,6 +286,8 @@ ext3_check_acl(struct inode *inode, int mask)
286{ 286{
287 struct posix_acl *acl = ext3_get_acl(inode, ACL_TYPE_ACCESS); 287 struct posix_acl *acl = ext3_get_acl(inode, ACL_TYPE_ACCESS);
288 288
289 if (IS_ERR(acl))
290 return PTR_ERR(acl);
289 if (acl) { 291 if (acl) {
290 int error = posix_acl_permission(inode, acl, mask); 292 int error = posix_acl_permission(inode, acl, mask);
291 posix_acl_release(acl); 293 posix_acl_release(acl);