Commit f42b4553 authored by Al Viro's avatar Al Viro Committed by Sasha Levin

path_openat(): fix double fput()

[ Upstream commit f15133df ]

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: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent d7259f44
...@@ -3197,7 +3197,7 @@ static struct file *path_openat(int dfd, struct filename *pathname, ...@@ -3197,7 +3197,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
if (unlikely(file->f_flags & __O_TMPFILE)) { if (unlikely(file->f_flags & __O_TMPFILE)) {
error = do_tmpfile(dfd, pathname, nd, flags, op, file, &opened); 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); error = path_init(dfd, pathname->name, flags | LOOKUP_PARENT, nd, &base);
...@@ -3235,6 +3235,7 @@ static struct file *path_openat(int dfd, struct filename *pathname, ...@@ -3235,6 +3235,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
path_put(&nd->root); path_put(&nd->root);
if (base) if (base)
fput(base); fput(base);
out2:
if (!(opened & FILE_OPENED)) { if (!(opened & FILE_OPENED)) {
BUG_ON(!error); BUG_ON(!error);
put_filp(file); put_filp(file);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment