[Glibc-bsd-commits] r4369 - in trunk/kfreebsd-8/debian: . patches

[Christoph Egger]

Author: christoph
Date: 2012-11-03 01:43:40 +0000 (Sat, 03 Nov 2012)
New Revision: 4369

Added:
   trunk/kfreebsd-8/debian/patches/SCTP_DOS_svn239447.diff
Modified:
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/patches/series
Log:
Pick upstream commit 239447 fixing SCTP DoS vulnerability


Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2012-11-03 01:41:18 UTC (rev 4368)
+++ trunk/kfreebsd-8/debian/changelog	2012-11-03 01:43:40 UTC (rev 4369)
@@ -1,9 +1,14 @@
-kfreebsd-8 (8.3-5) UNRELEASED; urgency=low
+kfreebsd-8 (8.3-5) unstable; urgency=medium
 
+  [ Robert Millan ]
   * Remove /boot symlink kludge.  (Closes: #672255)
 
- -- Robert Millan <rmh at debian.org>  Fri, 15 Jun 2012 22:15:38 +0200
+  [ Christoph Egger ]
+  * Import svn239447 from upstream 8-STABLE to fix a DoS vulnerability in
+    SCTP (Closes: #686961)
 
+ -- Christoph Egger <christoph at debian.org>  Fri, 02 Nov 2012 13:32:11 -0700
+
 kfreebsd-8 (8.3-4) unstable; urgency=high
 
   [ Steven Chamberlain ]

Added: trunk/kfreebsd-8/debian/patches/SCTP_DOS_svn239447.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/SCTP_DOS_svn239447.diff	                        (rev 0)
+++ trunk/kfreebsd-8/debian/patches/SCTP_DOS_svn239447.diff	2012-11-03 01:43:40 UTC (rev 4369)
@@ -0,0 +1,19 @@
+Index: sys/netinet/sctp_pcb.c
+===================================================================
+--- a/sys/netinet/sctp_pcb.c	(revision 239446)
++++ b/sys/netinet/sctp_pcb.c	(revision 239447)
+@@ -2048,8 +2048,6 @@
+ 	struct sctp_nets *net;
+ 	struct sctp_tcb *stcb;
+ 
+-	*netp = NULL;
+-	*inp_p = NULL;
+ 	SCTP_INP_INFO_RLOCK();
+ 	head = &SCTP_BASE_INFO(sctp_asochash)[SCTP_PCBHASH_ASOC(vtag,
+ 	    SCTP_BASE_INFO(hashasocmark))];
+
+Property changes on: sys
+___________________________________________________________________
+Modified: svn:mergeinfo
+   Merged /head/sys:r239041
+

Modified: trunk/kfreebsd-8/debian/patches/series
===================================================================
--- trunk/kfreebsd-8/debian/patches/series	2012-11-03 01:41:18 UTC (rev 4368)
+++ trunk/kfreebsd-8/debian/patches/series	2012-11-03 01:43:40 UTC (rev 4369)
@@ -11,6 +11,7 @@
 amd64_increase_DFLDSIZ.diff
 SA-12_04.sysret.patch
 EN-12_02.ipv6refcount.patch
+SCTP_DOS_svn239447.diff
 
 # Other patches that might or might not be mergeable
 001_misc.diff