summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuzuki <suzuki@In.ibm.com>2006-02-07 12:58:36 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-07 16:12:32 -0800
commit3bc8414b079ec372485c99ed1f33c6c42ca9d756 (patch)
treebdb939f8ef5ad746ac61948c8476683c9e83334f
parentc00a76aea339b427b47ddc28de06dee0a652e801 (diff)
downloadop-kernel-dev-3bc8414b079ec372485c99ed1f33c6c42ca9d756.zip
op-kernel-dev-3bc8414b079ec372485c99ed1f33c6c42ca9d756.tar.gz
[PATCH] Fix do_path_lookup() to add the check for error in link_path_walk()
Fix do_path_lookup() to avoid accessing invalid dentry or inode when the link_path_walk() has failed. This should fix Bugme #5897. Signed-off-by: Suzuki K P <suzuki@in.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--fs/namei.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/namei.c b/fs/namei.c
index faf61c35..e28de84 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1119,9 +1119,11 @@ static int fastcall do_path_lookup(int dfd, const char *name,
current->total_link_count = 0;
retval = link_path_walk(name, nd);
out:
- if (unlikely(current->audit_context
- && nd && nd->dentry && nd->dentry->d_inode))
+ if (likely(retval == 0)) {
+ if (unlikely(current->audit_context && nd && nd->dentry &&
+ nd->dentry->d_inode))
audit_inode(name, nd->dentry->d_inode, flags);
+ }
return retval;
fput_unlock_fail:
OpenPOWER on IntegriCloud