diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2015-05-08 22:53:15 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-08-16 20:51:54 -0700 |
| commit | 88b4f377466cb673777d27693acf70108a908106 (patch) | |
| tree | 363388c6c1f10e71f155cbb24aead1ed4562b139 /fs | |
| parent | c76b576d5e9c2966847b08fa634ed395ac8f97b8 (diff) | |
path_openat(): fix double fput()
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/namei.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/namei.c b/fs/namei.c index ccb8000f3459..c6fa07942b2a 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); |