lkml.org 
[lkml]   [2016]   [Mar]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.2.y-ckt 218/273] do_last(): ELOOP failure exit should be done after leaving RCU mode
    Date
    4.2.8-ckt5 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Al Viro <viro@zeniv.linux.org.uk>

    commit 5129fa482b16615fd4464d2f5d23acb1b7056c66 upstream.

    ... or we risk seeing a bogus value of d_is_symlink() there.

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    fs/namei.c | 9 ++++-----
    1 file changed, 4 insertions(+), 5 deletions(-)

    diff --git a/fs/namei.c b/fs/namei.c
    index 414561f..7f8e493 100644
    --- a/fs/namei.c
    +++ b/fs/namei.c
    @@ -3152,11 +3152,6 @@ finish_lookup:
    if (unlikely(error))
    return error;

    - if (unlikely(d_is_symlink(path.dentry)) && !(open_flag & O_PATH)) {
    - path_to_nameidata(&path, nd);
    - return -ELOOP;
    - }
    -
    if ((nd->flags & LOOKUP_RCU) || nd->path.mnt != path.mnt) {
    path_to_nameidata(&path, nd);
    } else {
    @@ -3175,6 +3170,10 @@ finish_open:
    return error;
    }
    audit_inode(nd->name, nd->path.dentry, 0);
    + if (unlikely(d_is_symlink(nd->path.dentry)) && !(open_flag & O_PATH)) {
    + error = -ELOOP;
    + goto out;
    + }
    error = -EISDIR;
    if ((open_flag & O_CREAT) && d_is_dir(nd->path.dentry))
    goto out;
    --
    2.7.0
    \
     
     \ /
      Last update: 2016-03-08 01:01    [W:2.283 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site