Browse Source

[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>
akpm@osdl.org 20 years ago
parent
commit
e493073d8d
2 changed files with 4 additions and 0 deletions
  1. 2 0
      fs/ext2/acl.c
  2. 2 0
      fs/ext3/acl.c

+ 2 - 0
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);
 	struct posix_acl *acl = ext2_get_acl(inode, ACL_TYPE_ACCESS);
 
 
+	if (IS_ERR(acl))
+		return PTR_ERR(acl);
 	if (acl) {
 	if (acl) {
 		int error = posix_acl_permission(inode, acl, mask);
 		int error = posix_acl_permission(inode, acl, mask);
 		posix_acl_release(acl);
 		posix_acl_release(acl);

+ 2 - 0
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);
 	struct posix_acl *acl = ext3_get_acl(inode, ACL_TYPE_ACCESS);
 
 
+	if (IS_ERR(acl))
+		return PTR_ERR(acl);
 	if (acl) {
 	if (acl) {
 		int error = posix_acl_permission(inode, acl, mask);
 		int error = posix_acl_permission(inode, acl, mask);
 		posix_acl_release(acl);
 		posix_acl_release(acl);