Skip to content

Commit

Permalink
path_openat(): fix double fput()
Browse files Browse the repository at this point in the history
commit f15133d 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Al Viro authored and Greg Kroah-Hartman committed Aug 17, 2015
1 parent c76b576 commit 88b4f37
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion fs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -3209,6 +3209,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
path_put(&nd->root);
if (base)
fput(base);
out2:
if (!(opened & FILE_OPENED)) {
BUG_ON(!error);
put_filp(file);
Expand Down

0 comments on commit 88b4f37

Please sign in to comment.