lkml.org 
[lkml]   [2015]   [May]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 085/110] namei: may_follow_link() - lift terminate_walk() on failures into caller
    Date
    From: Al Viro <viro@zeniv.linux.org.uk>

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    ---
    fs/namei.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/fs/namei.c b/fs/namei.c
    index 6d4692d..51e2214 100644
    --- a/fs/namei.c
    +++ b/fs/namei.c
    @@ -798,7 +798,6 @@ static inline int may_follow_link(struct nameidata *nd)
    return 0;

    audit_log_link_denied("follow_link", &nd->stack[0].link);
    - terminate_walk(nd);
    return -EACCES;
    }

    @@ -1980,8 +1979,10 @@ static int trailing_symlink(struct nameidata *nd)
    {
    const char *s;
    int error = may_follow_link(nd);
    - if (unlikely(error))
    + if (unlikely(error)) {
    + terminate_walk(nd);
    return error;
    + }
    nd->flags |= LOOKUP_PARENT;
    nd->stack[0].name = NULL;
    s = get_link(nd);
    --
    2.1.4


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