]> git.baikalelectronics.ru Git - kernel.git/commitdiff
path_openat(): fix double fput()
authorAl Viro <viro@zeniv.linux.org.uk>
Sat, 9 May 2015 02:53:15 +0000 (22:53 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Sat, 9 May 2015 04:12:48 +0000 (00:12 -0400)
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().

Cc: stable@vger.kernel.org # v3.11+
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/namei.c

index f67cf6cef9866ec3c70f1058a93693e939535281..fe30d3be43a8b381d3b9ac3016b28531996f91b7 100644 (file)
@@ -3233,7 +3233,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, flags, nd);
@@ -3263,6 +3263,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
        }
 out:
        path_cleanup(nd);
+out2:
        if (!(opened & FILE_OPENED)) {
                BUG_ON(!error);
                put_filp(file);