diff options
author | akpm@osdl.org <akpm@osdl.org> | 2005-04-16 18:24:00 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 18:24:00 -0400 |
commit | e493073d8d053429fbb42331b57a95dd0d61cadb (patch) | |
tree | c4d697372f6c2f2e2f2548f75c1dbb5b821ab805 /fs/ext2/acl.c | |
parent | 81ddef77bb774e771db8588b937665cd38f40cee (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/ext2/acl.c')
-rw-r--r-- | fs/ext2/acl.c | 2 |
1 files changed, 2 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); |