]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
tcp: Increase TCP_MAXSEG socket option minimum.
authorDavid S. Miller <davem@davemloft.net>
Thu, 11 Nov 2010 05:35:37 +0000 (21:35 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 11 Nov 2010 05:35:37 +0000 (21:35 -0800)
As noted by Steve Chen, since commit
f5fff5dc8a7a3f395b0525c02ba92c95d42b7390 ("tcp: advertise MSS
requested by user") we can end up with a situation where
tcp_select_initial_window() does a divide by a zero (or
even negative) mss value.

The problem is that sometimes we effectively subtract
TCPOLEN_TSTAMP_ALIGNED and/or TCPOLEN_MD5SIG_ALIGNED from the mss.

Fix this by increasing the minimum from 8 to 64.

Reported-by: Steve Chen <schen@mvista.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/tcp.c

index 245603c4ad48127fe0676b95bd0174c9cf58b1ae..0814199694854e534eb4ff12671e02313dced8e9 100644 (file)
@@ -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 < 8 || val > MAX_TCP_WINDOW) {
+               if (val < 64 || val > MAX_TCP_WINDOW) {
                        err = -EINVAL;
                        break;
                }