patch-2.2.10 linux/net/ipv4/tcp_ipv4.c

• Lines: 36
• Date: Wed Jun 2 09:55:22 1999
• Orig file: v2.2.9/linux/net/ipv4/tcp_ipv4.c
• Orig date: Tue May 11 13:10:32 1999

diff -u --recursive --new-file v2.2.9/linux/net/ipv4/tcp_ipv4.c linux/net/ipv4/tcp_ipv4.c
@@ -5,7 +5,7 @@
  *
  *		Implementation of the Transmission Control Protocol(TCP).
  *
- * Version:	$Id: tcp_ipv4.c,v 1.175 1999/05/08 21:09:54 davem Exp $
+ * Version:	$Id: tcp_ipv4.c,v 1.175.2.2 1999/06/02 04:06:15 davem Exp $
  *
  *		IPv4 specific functions
  *
@@ -1328,7 +1328,6 @@
 
 		newsk->done = 0;
 		newsk->proc = 0;
-		newsk->pair = NULL;
 		skb_queue_head_init(&newsk->back_log);
 		skb_queue_head_init(&newsk->error_queue);
 #ifdef CONFIG_FILTER
@@ -1648,6 +1647,7 @@
 	/* Count it even if it's bad */
 	tcp_statistics.TcpInSegs++;
 
+	len = skb->len;
 	if (len < sizeof(struct tcphdr))
 		goto bad_packet;
 
@@ -1673,6 +1673,10 @@
 	default:
 		/* CHECKSUM_UNNECESSARY */
 	}
+
+	if((th->doff * 4) < sizeof(struct tcphdr) ||
+	   len < (th->doff * 4))
+		goto bad_packet;
 
 #ifdef CONFIG_IP_TRANSPARENT_PROXY
 	if (IPCB(skb)->redirport)