lkml.org 
[lkml]   [2011]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[040/165] VFS: move BUG_ON test for symlink nd->depth after
    2.6.39-stable review patch.  If anyone has any objections, please let us know.

    ------------------
    current->link_count test
    Content-Length: 1009
    Lines: 37

    From: Erez Zadok <ezk@fsl.cs.sunysb.edu>

    commit 1a4022f88d40e1255920b017556092ab926d7f66 upstream.

    This solves a serious VFS-level bug in nested_symlink (which was
    rewritten from do_follow_link), and follows the order of depth tests
    that existed before.

    The bug triggers a BUG_ON in fs/namei.c:1381, when running racer with
    symlink and rename ops.

    Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>
    Acked-by: Miklos Szeredi <mszeredi@suse.cz>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    fs/namei.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/fs/namei.c
    +++ b/fs/namei.c
    @@ -1378,12 +1378,12 @@ static inline int nested_symlink(struct
    {
    int res;

    - BUG_ON(nd->depth >= MAX_NESTED_LINKS);
    if (unlikely(current->link_count >= MAX_NESTED_LINKS)) {
    path_put_conditional(path, nd);
    path_put(&nd->path);
    return -ELOOP;
    }
    + BUG_ON(nd->depth >= MAX_NESTED_LINKS);

    nd->depth++;
    current->link_count++;



    \
     
     \ /
      Last update: 2011-06-01 10:59    [W:4.289 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site