[Glibc-bsd-commits] r3250 - in branches/squeeze/kfreebsd-8/debian: . patches

[Petr Salinger]

Author: ps-guest
Date: 2011-02-06 17:39:21 +0000 (Sun, 06 Feb 2011)
New Revision: 3250

Added:
   branches/squeeze/kfreebsd-8/debian/patches/000_tcp_usrreq.diff
Modified:
   branches/squeeze/kfreebsd-8/debian/changelog
   branches/squeeze/kfreebsd-8/debian/patches/108_teken_utf8_table.diff
   branches/squeeze/kfreebsd-8/debian/patches/series
Log:
1st kfreebsd proposed update for stable ...



Modified: branches/squeeze/kfreebsd-8/debian/changelog
===================================================================
--- branches/squeeze/kfreebsd-8/debian/changelog	2011-02-06 13:18:01 UTC (rev 3249)
+++ branches/squeeze/kfreebsd-8/debian/changelog	2011-02-06 17:39:21 UTC (rev 3250)
@@ -1,3 +1,12 @@
+kfreebsd-8 (8.1+dfsg-8) STABLE; urgency=low
+
+  [ Petr Salinger ]
+  * Add 000_tcp_usrreq.diff, fixes local DoS. Closes #611476.
+  * Extend 108_teken_utf8_table.diff for middle-dot l/L.
+    Closes: #609681. Thanks to Robert Millan.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sun, 06 Feb 2011 18:36:42 +0100
+
 kfreebsd-8 (8.1+dfsg-7.1) unstable; urgency=high
 
   * Non-maintainer upload (requested by Petr Salinger).

Added: branches/squeeze/kfreebsd-8/debian/patches/000_tcp_usrreq.diff
===================================================================
--- branches/squeeze/kfreebsd-8/debian/patches/000_tcp_usrreq.diff	                        (rev 0)
+++ branches/squeeze/kfreebsd-8/debian/patches/000_tcp_usrreq.diff	2011-02-06 17:39:21 UTC (rev 3250)
@@ -0,0 +1,23 @@
+HEAD: 218271
+URL: http://svn.freebsd.org/changeset/base/218271
+
+Log:
+  When turning off TCP_NOPUSH, only call tcp_output() to immediately flush
+  any pending data if the connection is established.
+
+
+--- a/sys/netinet/tcp_usrreq.c
++++ b/sys/netinet/tcp_usrreq.c
+@@ -1328,9 +1328,10 @@
+ 			INP_WLOCK_RECHECK(inp);
+ 			if (optval)
+ 				tp->t_flags |= TF_NOPUSH;
+-			else {
++			else if (tp->t_flags & TF_NOPUSH) {
+ 				tp->t_flags &= ~TF_NOPUSH;
+-				error = tcp_output(tp);
++				if (TCPS_HAVEESTABLISHED(tp->t_state))
++					error = tcp_output(tp);
+ 			}
+ 			INP_WUNLOCK(inp);
+ 			break;

Modified: branches/squeeze/kfreebsd-8/debian/patches/108_teken_utf8_table.diff
===================================================================
--- branches/squeeze/kfreebsd-8/debian/patches/108_teken_utf8_table.diff	2011-02-06 13:18:01 UTC (rev 3249)
+++ branches/squeeze/kfreebsd-8/debian/patches/108_teken_utf8_table.diff	2011-02-06 17:39:21 UTC (rev 3250)
@@ -23,7 +23,15 @@
  	{ 0x00df, 0xe1, 0x00 }, { 0x00e0, 0x85, 0x00 },
  	{ 0x00e1, 0xa0, 0x00 }, { 0x00e2, 0x83, 0x00 },
  	{ 0x00e4, 0x84, 0x00 }, { 0x00e5, 0x86, 0x00 },
-@@ -422,7 +422,8 @@
+@@ -374,6 +382,7 @@
+ 	{ 0x00f8, 0xed, 0x00 }, { 0x00f9, 0x97, 0x00 },
+ 	{ 0x00fa, 0xa3, 0x00 }, { 0x00fb, 0x96, 0x00 },
+ 	{ 0x00fc, 0x81, 0x00 }, { 0x00ff, 0x98, 0x00 },
++	{ 0x013f, 0x4c, 0x00 }, { 0x0140, 0x6c, 0x00 },
+ 	{ 0x0192, 0x9f, 0x00 }, { 0x0393, 0xe2, 0x00 },
+ 	{ 0x0398, 0xe9, 0x00 }, { 0x03a3, 0xe4, 0x00 },
+ 	{ 0x03a6, 0xe8, 0x00 }, { 0x03a9, 0xea, 0x00 },
+@@ -422,7 +431,8 @@
  	{ 0x2584, 0xdc, 0x00 }, { 0x2588, 0xdb, 0x00 },
  	{ 0x258c, 0xdd, 0x00 }, { 0x2590, 0xde, 0x00 },
  	{ 0x2591, 0xb0, 0x02 }, { 0x25a0, 0xfe, 0x00 },

Modified: branches/squeeze/kfreebsd-8/debian/patches/series
===================================================================
--- branches/squeeze/kfreebsd-8/debian/patches/series	2011-02-06 13:18:01 UTC (rev 3249)
+++ branches/squeeze/kfreebsd-8/debian/patches/series	2011-02-06 17:39:21 UTC (rev 3250)
@@ -2,6 +2,7 @@
 000_ata.diff
 000_coda.diff
 000_ufs_lookup.diff  
+000_tcp_usrreq.diff
 001_misc.diff
 003_glibc_dev_aicasm.diff
 004_xargs.diff