diff options
| author | akpm@osdl.org <akpm@osdl.org> | 2005-04-16 15:24:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 15:24:00 -0700 |
| commit | e493073d8d053429fbb42331b57a95dd0d61cadb (patch) | |
| tree | c4d697372f6c2f2e2f2548f75c1dbb5b821ab805 /fs | |
| parent | 81ddef77bb774e771db8588b937665cd38f40cee (diff) | |
| download | kernel_samsung_tuna-e493073d8d053429fbb42331b57a95dd0d61cadb.zip kernel_samsung_tuna-e493073d8d053429fbb42331b57a95dd0d61cadb.tar.gz kernel_samsung_tuna-e493073d8d053429fbb42331b57a95dd0d61cadb.tar.bz2 | |
[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.c | 2 | ||||
| -rw-r--r-- | fs/ext3/acl.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/fs/ext2/acl.c b/fs/ext2/acl.c index 8369ee8..25f4a64 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 328592c..638c13a 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); |