[Glibc-bsd-commits] r4392 - in trunk/kfreebsd-9/debian: . patches

[Steven Chamberlain]

Author: stevenc-guest
Date: 2013-04-29 21:57:18 +0000 (Mon, 29 Apr 2013)
New Revision: 4392

Added:
   trunk/kfreebsd-9/debian/patches/SA-13_05.nfsserver.patch
Modified:
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/patches/series
Log:
Pick SVN 250060 from FreeBSD 9-STABLE to fix SA-13:05 / CVE-2013-3266:
Insufficient input validation in the NFS server (Closes: #706414)


Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog	2013-04-20 14:26:24 UTC (rev 4391)
+++ trunk/kfreebsd-9/debian/changelog	2013-04-29 21:57:18 UTC (rev 4392)
@@ -1,3 +1,11 @@
+kfreebsd-9 (9.0-11) UNRELEASED; urgency=high
+
+  * Team upload.
+  * Pick SVN 250060 from FreeBSD 9-STABLE to fix SA-13:05 / CVE-2013-3266:
+    Insufficient input validation in the NFS server (Closes: #706414)
+
+ -- Steven Chamberlain <steven at pyro.eu.org>  Mon, 29 Apr 2013 22:20:53 +0100
+
 kfreebsd-9 (9.0-10) unstable; urgency=low
 
   * Revert "Touch conf/DEBIAN" causing build failures in "normal" mode

Added: trunk/kfreebsd-9/debian/patches/SA-13_05.nfsserver.patch
===================================================================
--- trunk/kfreebsd-9/debian/patches/SA-13_05.nfsserver.patch	                        (rev 0)
+++ trunk/kfreebsd-9/debian/patches/SA-13_05.nfsserver.patch	2013-04-29 21:57:18 UTC (rev 4392)
@@ -0,0 +1,21 @@
+Description:
+ Fix a bug that allows NFS clients to issue READDIR on files. [13:05]
+ (CVE-2013-3266)
+Origin: vendor, http://security.freebsd.org/patches/SA-13:05/nfsserver.patch
+Bug: http://security.freebsd.org/advisories/FreeBSD-SA-13:05.nfsserver.asc
+Bug-Debian: http://bugs.debian.org/706414
+Applied-Upstream: http://svnweb.freebsd.org/base?view=revision&revision=250060
+
+Index: kfreebsd-9-9.0/sys/fs/nfsserver/nfs_nfsdport.c
+===================================================================
+--- kfreebsd-9-9.0.orig/sys/fs/nfsserver/nfs_nfsdport.c	2013-04-29 22:53:42.000000000 +0100
++++ kfreebsd-9-9.0/sys/fs/nfsserver/nfs_nfsdport.c	2013-04-29 22:54:00.428787262 +0100
+@@ -1550,6 +1550,8 @@
+ 			nd->nd_repstat = NFSERR_BAD_COOKIE;
+ #endif
+ 	}
++	if (!nd->nd_repstat && vp->v_type != VDIR)
++		nd->nd_repstat = NFSERR_NOTDIR;
+ 	if (nd->nd_repstat == 0 && cnt == 0) {
+ 		if (nd->nd_flag & ND_NFSV2)
+ 			/* NFSv2 does not have NFSERR_TOOSMALL */

Modified: trunk/kfreebsd-9/debian/patches/series
===================================================================
--- trunk/kfreebsd-9/debian/patches/series	2013-04-20 14:26:24 UTC (rev 4391)
+++ trunk/kfreebsd-9/debian/patches/series	2013-04-29 21:57:18 UTC (rev 4392)
@@ -8,6 +8,7 @@
 pf_counter_initialization_SVN236364.diff
 svn239447_SCTP_DoS.patch
 SA-12_08.linux.patch
+SA-13_05.nfsserver.patch
 
 # Other patches that might or might not be mergeable
 001_misc.diff