2017-10-31 13:24:35 -04:00
|
|
|
From f15133df088ecadd141ea1907f2c96df67c729f0 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Al Viro <viro@zeniv.linux.org.uk>
|
|
|
|
|
Date: Fri, 8 May 2015 22:53:15 -0400
|
|
|
|
|
Subject: path_openat(): fix double fput()
|
|
|
|
|
|
|
|
|
|
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 | 3 ++-
|
|
|
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/fs/namei.c b/fs/namei.c
|
|
|
|
|
index f67cf6c..fe30d3b 100644
|
|
|
|
|
--- a/fs/namei.c
|
|
|
|
|
+++ b/fs/namei.c
|
|
|
|
|
@@ -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);
|
|
|
|
|
--
|
|
|
|
|
cgit v1.1
|
|
|
|
|
|
