[kernel] r22584 - in dists/trunk/linux/debian: . patches patches/bugfix/all

[Ben Hutchings]

Author: benh
Date: Sun May 10 19:07:03 2015
New Revision: 22584

Log:
path_openat(): fix double fput()

Added:
   dists/trunk/linux/debian/patches/bugfix/all/path_openat-fix-double-fput.patch
Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/patches/series

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Sun May 10 18:57:37 2015	(r22583)
+++ dists/trunk/linux/debian/changelog	Sun May 10 19:07:03 2015	(r22584)
@@ -140,6 +140,7 @@
   * [alpha,armel/kirkwood,hppa,ia64,mips*/{octeon,sb1-bcm91250a}] Re-enable PM
   * [armel/orion5x] Enable PM
   * [armhf] sound: Enable SND_SIMPLE_CARD as module
+  * path_openat(): fix double fput()
 
   [ Ian Campbell ]
   * [armhf] Enable support for Freescale SNVS RTC. (Closes: #782364)

Added: dists/trunk/linux/debian/patches/bugfix/all/path_openat-fix-double-fput.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/bugfix/all/path_openat-fix-double-fput.patch	Sun May 10 19:07:03 2015	(r22584)
@@ -0,0 +1,34 @@
+From: Al Viro <viro at zeniv.linux.org.uk>
+Date: Fri, 8 May 2015 22:53:15 -0400
+Subject: path_openat(): fix double fput()
+Origin: https://git.kernel.org/linus/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().
+
+Cc: stable at vger.kernel.org	# v3.11+
+Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
+---
+ fs/namei.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/fs/namei.c
++++ b/fs/namei.c
+@@ -3228,7 +3228,7 @@ static struct file *path_openat(int dfd,
+ 
+ 	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, nd);
+@@ -3258,6 +3258,7 @@ static struct file *path_openat(int dfd,
+ 	}
+ out:
+ 	path_cleanup(nd);
++out2:
+ 	if (!(opened & FILE_OPENED)) {
+ 		BUG_ON(!error);
+ 		put_filp(file);

Modified: dists/trunk/linux/debian/patches/series
==============================================================================
--- dists/trunk/linux/debian/patches/series	Sun May 10 18:57:37 2015	(r22583)
+++ dists/trunk/linux/debian/patches/series	Sun May 10 19:07:03 2015	(r22584)
@@ -65,3 +65,4 @@
 # Miscellaneous features
 features/all/efi-autoload-efi-pstore.patch
 bugfix/all/ipv4-missing-sk_nulls_node_init-in-ping_unhash.patch
+bugfix/all/path_openat-fix-double-fput.patch