lkml.org 
[lkml]   [2015]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13.y-ckt 056/122] path_openat(): fix double fput()
    Date
    3.13.11-ckt22 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

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

    commit f15133df088ecadd141ea1907f2c96df67c729f0 upstream.

    path_openat() jumps to the wrong place after do_tmpfile() - it has
    already done path_cleanup() (as part of path_lookupat() called by
    do_tmpfile()), so doing that again can lead to double fput().

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    [ luis: backported to 3.16:
    - adjusted context as 3.16 doesn't have path_cleanup() helper,
    introduced by 893b7775a70e ("fs/namei.c: new helper (path_cleanup())") ]
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    fs/namei.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/fs/namei.c b/fs/namei.c
    index f804083..5f6401d 100644
    --- a/fs/namei.c
    +++ b/fs/namei.c
    @@ -3171,7 +3171,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,

    if (unlikely(file->f_flags & __O_TMPFILE)) {
    error = do_tmpfile(dfd, pathname, nd, flags, op, file, &opened);
    - goto out;
    + goto out2;
    }

    error = path_init(dfd, pathname->name, flags | LOOKUP_PARENT, nd, &base);
    @@ -3209,6 +3209,7 @@ out:
    path_put(&nd->root);
    if (base)
    fput(base);
    +out2:
    if (!(opened & FILE_OPENED)) {
    BUG_ON(!error);
    put_filp(file);
    --
    1.9.1


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