r2269 - in trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian: . patches patches/series

[Joshua Kwan]

Author: joshk
Date: 2005-01-12 07:54:07 +0100 (Wed, 12 Jan 2005)
New Revision: 2269

Added:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/123_nfs_verify_eacces.diff
Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-8
Log:
add nfs patch

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2005-01-12 05:07:24 UTC (rev 2268)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2005-01-12 06:54:07 UTC (rev 2269)
@@ -1,18 +1,20 @@
-kernel-source-2.4.27 (2.4.27-8) UNRELEASED; urgency=low
+kernel-source-2.4.27 (2.4.27-8) UNRELEASED; urgency=high
 
   * add dh_fixperms to the build targets to kernel-patch-debian-2.4.27
     to ensure that the permissions of the files in this package are
     sensible. (Closes: Bug#288279) (Simon Horman)
   * [SECURITY] Fix vulnerability in the ELF loader code allowing
-    local attacker to execute code as root; CAN-2004-1235.
-    (closes: #289155) (Maximilian Attems)
-  * 121_drm-locking-checks-1.diff 121_drm-locking-checks-2.diff:
+    local attacker to execute code as root; CAN-2004-1235. This is better
+    known as the "uselib() bug". (closes: #289155) (Maximilian Attems)
+  * 121_drm-locking-checks-1.diff, 121_drm-locking-checks-2.diff:
      [SECURITY] Fix insufficient locking checks in DRM code; CAN-2004-1056
      (Fabio M. Di Nitto, Dann Frazier, Simon Horman). (Closes: Bug#285563)
   * Turn a make conditional into a runtime conditional to allow debian/rules
-    prune to work. closes: #289682
+    prune to work. closes: #289682 (Joshua Kwan)
+  * Return -EACCES instead of -ESTALE to fix some NFS data loss bugs, already
+    fixed in 2.6 but not in 2.4. closes: #288046 (Joshua Kwan)
 
- -- Joshua Kwan <joshk@triplehelix.org>  Mon, 10 Jan 2005 08:59:42 -0800
+ -- Joshua Kwan <joshk@triplehelix.org>  Tue, 11 Jan 2005 22:58:27 -0800
 
 kernel-source-2.4.27 (2.4.27-7) unstable; urgency=low
 

Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/123_nfs_verify_eacces.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/123_nfs_verify_eacces.diff	2005-01-12 05:07:24 UTC (rev 2268)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/123_nfs_verify_eacces.diff	2005-01-12 06:54:07 UTC (rev 2269)
@@ -0,0 +1,17 @@
+# origin: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=110421
+# cset: n/a (in 2.6 only)
+# inclusion: not submitted
+# description: fix possible data loss bug over NFS with root_squash
+# revision date: 2005-01-11
+
+--- linux-2.4.21/fs/nfsd/nfsfh.c.old	Sat Sep 25 05:11:04 2004
++++ linux-2.4.21/fs/nfsd/nfsfh.c	Fri Oct  1 07:43:32 2004
+@@ -712,7 +712,7 @@ fh_verify(struct svc_rqst *rqstp, struct
+ 			tdentry = parent;
+ 		}
+ 		if (exp->ex_dentry != tdentry) {
+-			error = nfserr_stale;
++			error = nfserr_acces;
+ 			printk("fh_verify: no root_squashed access at %s/%s.\n",
+ 			       dentry->d_parent->d_name.name,
+ 			       dentry->d_name.name);

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-8
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-8	2005-01-12 05:07:24 UTC (rev 2268)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-8	2005-01-12 06:54:07 UTC (rev 2269)
@@ -1,3 +1,4 @@
 + 121_drm-locking-checks-1.diff
 + 121_drm-locking-checks-2.diff
 + 122_sec_brk-locked.diff
++ 123_nfs_verify_eacces.diff