diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-15 09:55:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-15 09:55:39 -0700 |
| commit | da1b001a2a2a9cb323e58327ed07ac4a5e6d96ea (patch) | |
| tree | b4d183c6a4bab6a2b53d9ac9f4501bcd46cb158b /fs/namei.c | |
| parent | df8d6fe9efba4ea4b46a5bdc229031c5bb880575 (diff) | |
| parent | 1836750115f20b774e55c032a3893e8c5bdf41ed (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
fix loop checks in d_materialise_unique()
Fix ->d_lock locking order in unlazy_walk()
Diffstat (limited to 'fs/namei.c')
| -rw-r--r-- | fs/namei.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/namei.c b/fs/namei.c index 0223c41fb11..5c867dd1c0b 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -433,6 +433,8 @@ static int unlazy_walk(struct nameidata *nd, struct dentry *dentry) goto err_parent; BUG_ON(nd->inode != parent->d_inode); } else { + if (dentry->d_parent != parent) + goto err_parent; spin_lock_nested(&dentry->d_lock, DENTRY_D_LOCK_NESTED); if (!__d_rcu_to_refcount(dentry, nd->seq)) goto err_child; |