diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-22 12:10:45 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-05-10 22:18:31 -0400 |
| commit | a5cfe2d5e14d4c2dec06b22d18050c443c7537f9 (patch) | |
| tree | 675ff9450e7eafa62da07c63bc4262964909246c | |
| parent | fd2805be238947eb819284189205e8de6f6c41c4 (diff) | |
| download | blackbird-op-linux-a5cfe2d5e14d4c2dec06b22d18050c443c7537f9.tar.gz blackbird-op-linux-a5cfe2d5e14d4c2dec06b22d18050c443c7537f9.zip | |
do_last: regularize the logics around following symlinks
With LOOKUP_FOLLOW we unlazy and return 1; without it we either
fail with ELOOP or, for O_PATH opens, succeed. No need to mix
those cases...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/namei.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/fs/namei.c b/fs/namei.c index 3e452338f1b7..54cbfe799249 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -3046,9 +3046,7 @@ retry_lookup: goto out; } finish_lookup: - /* we _can_ be in RCU mode here */ - if (should_follow_link(path->dentry, - !(open_flag & O_PATH) || (nd->flags & LOOKUP_FOLLOW))) { + if (should_follow_link(path->dentry, nd->flags & LOOKUP_FOLLOW)) { if (nd->flags & LOOKUP_RCU) { if (unlikely(nd->path.mnt != path->mnt || unlazy_walk(nd, path->dentry))) { @@ -3057,14 +3055,15 @@ finish_lookup: } } BUG_ON(inode != path->dentry->d_inode); - if (!(nd->flags & LOOKUP_FOLLOW)) { - path_put_conditional(path, nd); - path_put(&nd->path); - return -ELOOP; - } return 1; } + if (unlikely(d_is_symlink(path->dentry)) && !(open_flag & O_PATH)) { + path_to_nameidata(path, nd); + error = -ELOOP; + goto out; + } + if ((nd->flags & LOOKUP_RCU) || nd->path.mnt != path->mnt) { path_to_nameidata(path, nd); } else { |
