Commit d8ef4f4c authored by Al Viro's avatar Al Viro Committed by Kamal Mostafa

path_openat(): fix double fput()

commit f15133df 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: default avatarAl Viro <viro@zeniv.linux.org.uk>
[ luis: backported to 3.16:
  - adjusted context as 3.16 doesn't have path_cleanup() helper,
    introduced by 893b7775 ("fs/namei.c: new helper (path_cleanup())") ]
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
Signed-off-by: default avatarKamal Mostafa <kamal@canonical.com>
parent a748672b
...@@ -3171,7 +3171,7 @@ static struct file *path_openat(int dfd, struct filename *pathname, ...@@ -3171,7 +3171,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);
...@@ -3209,6 +3209,7 @@ static struct file *path_openat(int dfd, struct filename *pathname, ...@@ -3209,6 +3209,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