diff options
| author |   Al Viro <viro@zeniv.linux.org.uk> | 2015-04-22 12:02:25 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-05-10 22:18:30 -0400 |
| commit | fd2805be238947eb819284189205e8de6f6c41c4 (patch) | |
| tree | b7a71ce02d48152b0b866060c0d595c3dacdfde0 /fs/namei.c | |
| parent | namei: take O_NOFOLLOW treatment into do_last() (diff) | |
| download | linux-dev-fd2805be238947eb819284189205e8de6f6c41c4.tar.xz linux-dev-fd2805be238947eb819284189205e8de6f6c41c4.zip | |
do_last: kill symlink_ok
When O_PATH is present, O_CREAT isn't, so symlink_ok is always equal to
(open_flags & O_PATH) && !(nd->flags & LOOKUP_FOLLOW).
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to '')
| -rw-r--r-- | fs/namei.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/namei.c b/fs/namei.c index 4c1a8bf917e4..3e452338f1b7 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2931,7 +2931,6 @@ static int do_last(struct nameidata *nd, struct path *path, bool got_write = false; int acc_mode = op->acc_mode; struct inode *inode; - bool symlink_ok = false; struct path save_parent = { .dentry = NULL, .mnt = NULL }; bool retried = false; int error; @@ -2949,8 +2948,6 @@ static int do_last(struct nameidata *nd, struct path *path, if (!(open_flag & O_CREAT)) { if (nd->last.name[nd->last.len]) nd->flags |= LOOKUP_FOLLOW | LOOKUP_DIRECTORY; - if (open_flag & O_PATH && !(nd->flags & LOOKUP_FOLLOW)) - symlink_ok = true; /* we _can_ be in RCU mode here */ error = lookup_fast(nd, path, &inode); if (likely(!error)) @@ -3050,7 +3047,8 @@ retry_lookup: } finish_lookup: /* we _can_ be in RCU mode here */ - if (should_follow_link(path->dentry, !symlink_ok)) { + if (should_follow_link(path->dentry, + !(open_flag & O_PATH) || (nd->flags & LOOKUP_FOLLOW))) { if (nd->flags & LOOKUP_RCU) { if (unlikely(nd->path.mnt != path->mnt || unlazy_walk(nd, path->dentry))) { |