[kernel] r21896 - in dists/wheezy/linux/debian: . patches patches/bugfix/all

[Ben Hutchings]

Author: benh
Date: Wed Sep 24 01:09:29 2014
New Revision: 21896

Log:
nfsd: Fix ACL null pointer deref (thanks to Sergio Gelato) (Closes: #754420)

Added:
   dists/wheezy/linux/debian/patches/bugfix/all/nfsd-fix-acl-null-pointer-deref.patch
Modified:
   dists/wheezy/linux/debian/changelog
   dists/wheezy/linux/debian/patches/series

Modified: dists/wheezy/linux/debian/changelog
==============================================================================
--- dists/wheezy/linux/debian/changelog	Mon Sep 22 13:55:20 2014	(r21895)
+++ dists/wheezy/linux/debian/changelog	Wed Sep 24 01:09:29 2014	(r21896)
@@ -189,6 +189,8 @@
     - drm/radeon/atom: fix dithering on certain panels
     - drm/vmwgfx: Fix incorrect write to read-only register v2:
     - drm/radeon: stop poisoning the GART TLB
+  * nfsd: Fix ACL null pointer deref (thanks to Sergio Gelato)
+    (Closes: #754420)
 
   [ Cyril Brulebois ]
   * udeb: Add virtio_scsi to virtio-modules (Closes: #756249).

Added: dists/wheezy/linux/debian/patches/bugfix/all/nfsd-fix-acl-null-pointer-deref.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/wheezy/linux/debian/patches/bugfix/all/nfsd-fix-acl-null-pointer-deref.patch	Wed Sep 24 01:09:29 2014	(r21896)
@@ -0,0 +1,23 @@
+From: Sergio Gelato <Sergio.Gelato at astro.su.se>
+Date: 2014-09-01
+Subject: nfsd: Fix ACL null pointer deref
+Bug-Debian: https://bugs.debian.org/754420
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1348670
+Origin: https://bugs.launchpad.net/debian/+source/linux/+bug/1348670/+attachment/4192076/+files/nfsd-fix-acl-null-pointer-deref.patch
+
+Fix regression introduced in 3.2.60 by cherry-picking a post-3.14 patch that
+depends on the set_acl methods being able to cope with a NULL ACL argument.
+
+See Debian #754420, LP#1348670.
+--- a/fs/nfsd/vfs.c
++++ b/fs/nfsd/vfs.c
+@@ -508,6 +508,9 @@
+ 	char *buf = NULL;
+ 	int error = 0;
+ 
++	if (!pacl)
++		return vfs_setxattr(dentry, key, NULL, 0, 0);
++
+ 	buflen = posix_acl_xattr_size(pacl->a_count);
+ 	buf = kmalloc(buflen, GFP_KERNEL);
+ 	error = -ENOMEM;

Modified: dists/wheezy/linux/debian/patches/series
==============================================================================
--- dists/wheezy/linux/debian/patches/series	Mon Sep 22 13:55:20 2014	(r21895)
+++ dists/wheezy/linux/debian/patches/series	Wed Sep 24 01:09:29 2014	(r21896)
@@ -1131,3 +1131,4 @@
 debian/ip-ident-avoid-abi-change-in-3.2.63.patch
 debian/scsi-avoid-abi-change-in-3.2.62.patch
 debian/nlattr-avoid-abi-change-in-3.2.61.patch
+bugfix/all/nfsd-fix-acl-null-pointer-deref.patch