diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-24 15:47:07 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-24 15:52:14 -0400 |
commit | 3cab989afd8d8d1bc3d99fef0e7ed87c31e7b647 (patch) | |
tree | c696367810e2e603c3156127b6fb0eb4627a7132 /fs | |
parent | ac74d8d65c83d8061034d0908e1eab6a0c24f923 (diff) |
RCU pathwalk breakage when running into a symlink overmounting something
Calling unlazy_walk() in walk_component() and do_last() when we find
a symlink that needs to be followed doesn't acquire a reference to vfsmount.
That's fine when the symlink is on the same vfsmount as the parent directory
(which is almost always the case), but it's not always true - one _can_
manage to bind a symlink on top of something. And in such cases we end up
with excessive mntput().
Cc: stable@vger.kernel.org # since 2.6.39
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/namei.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/namei.c b/fs/namei.c index ffab2e06e147..4a8d998b7274 100644 --- a/fs/namei.c +++ b/fs/namei.c | |||
@@ -1590,7 +1590,8 @@ static inline int walk_component(struct nameidata *nd, struct path *path, | |||
1590 | 1590 | ||
1591 | if (should_follow_link(path->dentry, follow)) { | 1591 | if (should_follow_link(path->dentry, follow)) { |
1592 | if (nd->flags & LOOKUP_RCU) { | 1592 | if (nd->flags & LOOKUP_RCU) { |
1593 | if (unlikely(unlazy_walk(nd, path->dentry))) { | 1593 | if (unlikely(nd->path.mnt != path->mnt || |
1594 | unlazy_walk(nd, path->dentry))) { | ||
1594 | err = -ECHILD; | 1595 | err = -ECHILD; |
1595 | goto out_err; | 1596 | goto out_err; |
1596 | } | 1597 | } |
@@ -3045,7 +3046,8 @@ finish_lookup: | |||
3045 | 3046 | ||
3046 | if (should_follow_link(path->dentry, !symlink_ok)) { | 3047 | if (should_follow_link(path->dentry, !symlink_ok)) { |
3047 | if (nd->flags & LOOKUP_RCU) { | 3048 | if (nd->flags & LOOKUP_RCU) { |
3048 | if (unlikely(unlazy_walk(nd, path->dentry))) { | 3049 | if (unlikely(nd->path.mnt != path->mnt || |
3050 | unlazy_walk(nd, path->dentry))) { | ||
3049 | error = -ECHILD; | 3051 | error = -ECHILD; |
3050 | goto out; | 3052 | goto out; |
3051 | } | 3053 | } |