Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f0a684a authored by Al Viro's avatar Al Viro Committed by TARKZiM
Browse files

path_openat(): fix double fput()



[ Upstream commit f15133df088ecadd141ea1907f2c96df67c729f0 ]

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().

Change-Id: Ia74c130ae5e379b512532c0feebea871b5f73668
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 46db3b52
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -3029,7 +3029,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);
@@ -3067,6 +3067,7 @@ out:
		path_put(&nd->root);
	if (base)
		fput(base);
out2:
	if (!(opened & FILE_OPENED)) {
		BUG_ON(!error);
		put_filp(file);