lkml.org 
[lkml]   [2015]   [May]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 24/79] do_last: kill symlink_ok
    Date
    From: Al Viro <viro@zeniv.linux.org.uk>

    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>
    ---
    fs/namei.c | 6 ++----
    1 file changed, 2 insertions(+), 4 deletions(-)

    diff --git a/fs/namei.c b/fs/namei.c
    index 308f325..58293a8 100644
    --- a/fs/namei.c
    +++ b/fs/namei.c
    @@ -2923,7 +2923,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;
    @@ -2941,8 +2940,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))
    @@ -3043,7 +3040,8 @@ finish_lookup:
    goto out;
    }

    - 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))) {
    --
    2.1.4


    \
     
     \ /
      Last update: 2015-05-05 08:01    [W:4.081 / U:0.500 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site