[kernel] r16604 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Sat Nov 27 21:57:12 2010
New Revision: 16604

Log:
tcp: Make TCP_MAXSEG minimum more correct

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/tcp-Make-TCP_MAXSEG-minimum-more-correct.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/29

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sat Nov 27 21:42:32 2010	(r16603)
+++ dists/sid/linux-2.6/debian/changelog	Sat Nov 27 21:57:12 2010	(r16604)
@@ -3,6 +3,8 @@
   [ Ben Hutchings ]
   * megaraid_sas: Add support for 'entry-level' SAS controllers including
     the 9240 family (Closes: #604083)
+  * tcp: Make TCP_MAXSEG minimum more correct (refinement of fix for
+    CVE-2010-4165)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 27 Nov 2010 21:06:54 +0000
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/tcp-Make-TCP_MAXSEG-minimum-more-correct.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/tcp-Make-TCP_MAXSEG-minimum-more-correct.patch	Sat Nov 27 21:57:12 2010	(r16604)
@@ -0,0 +1,30 @@
+From: David S. Miller <davem at davemloft.net>
+Date: Wed, 24 Nov 2010 11:47:22 -0800
+Subject: [PATCH] tcp: Make TCP_MAXSEG minimum more correct.
+
+commit c39508d6f118308355468314ff414644115a07f3 upstream.
+
+Use TCP_MIN_MSS instead of constant 64.
+
+Reported-by: Min Zhang <mzhang at mvista.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ net/ipv4/tcp.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
+index 0814199..f15c36a 100644
+--- a/net/ipv4/tcp.c
++++ b/net/ipv4/tcp.c
+@@ -2246,7 +2246,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level,
+ 		/* Values greater than interface MTU won't take effect. However
+ 		 * at the point when this call is done we typically don't yet
+ 		 * know which interface is going to be used */
+-		if (val < 64 || val > MAX_TCP_WINDOW) {
++		if (val < TCP_MIN_MSS || val > MAX_TCP_WINDOW) {
+ 			err = -EINVAL;
+ 			break;
+ 		}
+-- 
+1.7.2.3
+

Modified: dists/sid/linux-2.6/debian/patches/series/29
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/29	Sat Nov 27 21:42:32 2010	(r16603)
+++ dists/sid/linux-2.6/debian/patches/series/29	Sat Nov 27 21:57:12 2010	(r16604)
@@ -3,3 +3,4 @@
 + features/all/SCSI-megaraid_sas-Add-new-megaraid-SAS-2-controller.patch
 + features/all/SCSI-megaraid_sas-allocate-cmds-to-sas2-controller.patch
 + features/all/SCSI-megaraid_sas-Fix-fw-hang-caused-by-megaraid-sas-app.patch
++ bugfix/all/tcp-Make-TCP_MAXSEG-minimum-more-correct.patch