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

[Petr Salinger]

Author: ps-guest
Date: 2011-02-06 17:44:28 +0000 (Sun, 06 Feb 2011)
New Revision: 3251

Added:
   trunk/kfreebsd-8/debian/patches/000_tcp_usrreq.diff
Modified:
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/patches/series
Log:
Add 000_tcp_usrreq.diff, fixes local DoS. Closes #611476.



Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2011-02-06 17:39:21 UTC (rev 3250)
+++ trunk/kfreebsd-8/debian/changelog	2011-02-06 17:44:28 UTC (rev 3251)
@@ -1,6 +1,7 @@
-kfreebsd-8 (8.2~rc1+dfsg-1) UNRELEASED; urgency=low
+kfreebsd-8 (8.2~rc3+dfsg-1) UNRELEASED; 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.
 

Added: trunk/kfreebsd-8/debian/patches/000_tcp_usrreq.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/000_tcp_usrreq.diff	                        (rev 0)
+++ trunk/kfreebsd-8/debian/patches/000_tcp_usrreq.diff	2011-02-06 17:44:28 UTC (rev 3251)
@@ -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: trunk/kfreebsd-8/debian/patches/series
===================================================================
--- trunk/kfreebsd-8/debian/patches/series	2011-02-06 17:39:21 UTC (rev 3250)
+++ trunk/kfreebsd-8/debian/patches/series	2011-02-06 17:44:28 UTC (rev 3251)
@@ -1,5 +1,6 @@
 000_coda.diff
 000_t_delta_warning.diff
+000_tcp_usrreq.diff
 001_misc.diff
 003_glibc_dev_aicasm.diff
 004_xargs.diff