diff options
author | Sage Weil <sage@newdream.net> | 2011-07-26 14:30:29 -0400 |
---|---|---|
committer | Sage Weil <sage@newdream.net> | 2011-07-26 14:30:29 -0400 |
commit | 5f21c96dd5c615341963036ae8f5e4f5227a818d (patch) | |
tree | 898c5781623b68527427d201e3f975827d08935c /fs/ceph/dir.c | |
parent | 48d0cbd1242aac969560ef8b90f26ee3b09a6a5c (diff) |
ceph: protect access to d_parent
d_parent is protected by d_lock: use it when looking up a dentry's parent
directory inode. Also take a reference and drop it in the caller to avoid
a use-after-free.
Reported-by: Al Viro <viro@ZenIV.linux.org.uk>
Reviewed-by: Yehuda Sadeh <yehuda@hq.newdream.net>
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/dir.c')
-rw-r--r-- | fs/ceph/dir.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c index 883c9546111d..ed296ec121d1 100644 --- a/fs/ceph/dir.c +++ b/fs/ceph/dir.c | |||
@@ -71,6 +71,21 @@ out_unlock: | |||
71 | return 0; | 71 | return 0; |
72 | } | 72 | } |
73 | 73 | ||
74 | struct inode *ceph_get_dentry_parent_inode(struct dentry *dentry) | ||
75 | { | ||
76 | struct inode *inode = NULL; | ||
77 | |||
78 | if (!dentry) | ||
79 | return NULL; | ||
80 | |||
81 | spin_lock(&dentry->d_lock); | ||
82 | if (dentry->d_parent) { | ||
83 | inode = dentry->d_parent->d_inode; | ||
84 | ihold(inode); | ||
85 | } | ||
86 | spin_unlock(&dentry->d_lock); | ||
87 | return inode; | ||
88 | } | ||
74 | 89 | ||
75 | 90 | ||
76 | /* | 91 | /* |