[kernel] r21915 - dists/wheezy/linux/debian/patches/bugfix/all

[Ben Hutchings]

Author: benh
Date: Sat Sep 27 02:52:33 2014
New Revision: 21915

Log:
Update header of nfs regression fix to match version sent to stable

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

Modified: dists/wheezy/linux/debian/patches/bugfix/all/nfsd-fix-acl-null-pointer-deref.patch
==============================================================================
--- dists/wheezy/linux/debian/patches/bugfix/all/nfsd-fix-acl-null-pointer-deref.patch	Sat Sep 27 02:41:30 2014	(r21914)
+++ dists/wheezy/linux/debian/patches/bugfix/all/nfsd-fix-acl-null-pointer-deref.patch	Sat Sep 27 02:52:33 2014	(r21915)
@@ -1,14 +1,28 @@
 From: Sergio Gelato <Sergio.Gelato at astro.su.se>
-Date: 2014-09-01
-Subject: nfsd: Fix ACL null pointer deref
+Date: Wed, 24 Sep 2014 08:47:24 +0200
+Subject: Re: NFS regression in 3.2.60
 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
+Origin: http://mid.gmane.org/20140924064724.GB4025@ebisu.astro.su.se
 
-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.
+BugLink: http://bugs.launchpad.net/bugs/1348670
 
-See Debian #754420, LP#1348670.
+Fix regression introduced in pre-3.14 kernels by cherry-picking
+aa07c713ecfc0522916f3cd57ac628ea6127c0ec
+(NFSD: Call ->set_acl with a NULL ACL structure if no entries).
+
+The affected code was removed in 3.14 by commit
+4ac7249ea5a0ceef9f8269f63f33cc873c3fac61
+(nfsd: use get_acl and ->set_acl).
+The ->set_acl methods are already able to cope with a NULL argument.
+
+Signed-off-by: Sergio Gelato <Sergio.Gelato at astro.su.se>
+---
+ fs/nfsd/vfs.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
+index 446dc01..fc208e4 100644
 --- a/fs/nfsd/vfs.c
 +++ b/fs/nfsd/vfs.c
 @@ -508,6 +508,9 @@