[kernel] r14099 - in dists/etch-security/linux-2.6/debian: . patches/bugfix/all patches/series

[Dann Frazier]

Author: dannf
Date: Tue Aug 11 06:12:34 2009
New Revision: 14099

Log:
nfs4: fix MAY_EXEC handling (CVE-2009-1630)

Added:
   dists/etch-security/linux-2.6/debian/patches/bugfix/all/nfs-v4-client-fix-MAY_EXEC-handling.patch
      - copied, changed from r14096, dists/etch-security/linux-2.6.24/debian/patches/bugfix/all/nfs-v4-client-fix-MAY_EXEC-handling.patch
Modified:
   dists/etch-security/linux-2.6/debian/changelog
   dists/etch-security/linux-2.6/debian/patches/series/24etch3

Modified: dists/etch-security/linux-2.6/debian/changelog
==============================================================================
--- dists/etch-security/linux-2.6/debian/changelog	Mon Aug 10 17:21:08 2009	(r14098)
+++ dists/etch-security/linux-2.6/debian/changelog	Tue Aug 11 06:12:34 2009	(r14099)
@@ -2,6 +2,7 @@
 
   * e1000: add missing length check to e1000 receive routine (CVE-2009-1385)
   * r8169: fix crash when large packets are received (CVE-2009-1389)
+  * nfs4: fix MAY_EXEC handling (CVE-2009-1630)
 
  -- dann frazier <dannf at debian.org>  Sat, 06 Jun 2009 09:55:38 -0600
 

Copied and modified: dists/etch-security/linux-2.6/debian/patches/bugfix/all/nfs-v4-client-fix-MAY_EXEC-handling.patch (from r14096, dists/etch-security/linux-2.6.24/debian/patches/bugfix/all/nfs-v4-client-fix-MAY_EXEC-handling.patch)
==============================================================================
--- dists/etch-security/linux-2.6.24/debian/patches/bugfix/all/nfs-v4-client-fix-MAY_EXEC-handling.patch	Sat Aug  8 12:37:43 2009	(r14096, copy source)
+++ dists/etch-security/linux-2.6/debian/patches/bugfix/all/nfs-v4-client-fix-MAY_EXEC-handling.patch	Tue Aug 11 06:12:34 2009	(r14099)
@@ -21,12 +21,12 @@
     Tested-by: Eugene Teo <eugeneteo at kernel.sg>
     Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
 
-Backported to Debian's 2.6.26 by dann frazier <dannf at debian.org>
+Backported to Debian's 2.6.18 by dann frazier <dannf at debian.org>
 
-diff -urpN linux-source-2.6.26.orig/fs/nfs/dir.c linux-source-2.6.26/fs/nfs/dir.c
---- linux-source-2.6.26.orig/fs/nfs/dir.c	2008-07-13 15:51:29.000000000 -0600
-+++ linux-source-2.6.26/fs/nfs/dir.c	2009-05-24 14:36:52.000000000 -0600
-@@ -1949,7 +1949,8 @@ int nfs_permission(struct inode *inode, 
+diff -urpN linux-source-2.6.18.orig/fs/nfs/dir.c linux-source-2.6.18/fs/nfs/dir.c
+--- linux-source-2.6.18.orig/fs/nfs/dir.c	2009-05-20 14:12:22.000000000 -0600
++++ linux-source-2.6.18/fs/nfs/dir.c	2009-08-10 23:43:40.000000000 -0600
+@@ -1722,7 +1722,8 @@ int nfs_permission(struct inode *inode, 
  			/* NFSv4 has atomic_open... */
  			if (nfs_server_capable(inode, NFS_CAP_ATOMIC_OPEN)
  					&& nd != NULL

Modified: dists/etch-security/linux-2.6/debian/patches/series/24etch3
==============================================================================
--- dists/etch-security/linux-2.6/debian/patches/series/24etch3	Mon Aug 10 17:21:08 2009	(r14098)
+++ dists/etch-security/linux-2.6/debian/patches/series/24etch3	Tue Aug 11 06:12:34 2009	(r14099)
@@ -1,2 +1,3 @@
 + bugfix/all/e1000-add-missing-length-check-to-e1000-receive-routine.patch
 + bugfix/all/r8169-fix-crash-when-large-packets-are-received.patch
++ bugfix/all/nfs-v4-client-fix-MAY_EXEC-handling.patch