From: akpm@osdl.org Date: Sat, 16 Apr 2005 22:24:00 +0000 (-0700) Subject: [PATCH] Fix acl Oops X-Git-Tag: v2.6.12-rc3~236 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e493073d8d053429fbb42331b57a95dd0d61cadb;p=linux-2.6 [PATCH] Fix acl Oops ) From: Andreas Gruenbacher 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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/fs/ext2/acl.c b/fs/ext2/acl.c index 8369ee8d28..25f4a64fd6 100644 --- a/fs/ext2/acl.c +++ b/fs/ext2/acl.c @@ -283,6 +283,8 @@ ext2_check_acl(struct inode *inode, int mask) { struct posix_acl *acl = ext2_get_acl(inode, ACL_TYPE_ACCESS); + if (IS_ERR(acl)) + return PTR_ERR(acl); if (acl) { int error = posix_acl_permission(inode, acl, mask); posix_acl_release(acl); diff --git a/fs/ext3/acl.c b/fs/ext3/acl.c index 328592c3a9..638c13a26c 100644 --- a/fs/ext3/acl.c +++ b/fs/ext3/acl.c @@ -286,6 +286,8 @@ ext3_check_acl(struct inode *inode, int mask) { struct posix_acl *acl = ext3_get_acl(inode, ACL_TYPE_ACCESS); + if (IS_ERR(acl)) + return PTR_ERR(acl); if (acl) { int error = posix_acl_permission(inode, acl, mask); posix_acl_release(acl);