Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/netinet/ip_input.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet/ip_input.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.256.2.1
retrieving revision 1.258
diff -u -p -r1.256.2.1 -r1.258
--- src/sys/netinet/ip_input.c	2007/12/26 19:57:39	1.256.2.1
+++ src/sys/netinet/ip_input.c	2007/12/21 18:58:55	1.258
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_input.c,v 1.256.2.1 2007/12/26 19:57:39 ad Exp $	*/
+/*	$NetBSD: ip_input.c,v 1.258 2007/12/21 18:58:55 matt Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -98,7 +98,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.256.2.1 2007/12/26 19:57:39 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.258 2007/12/21 18:58:55 matt Exp $");
 
 #include "opt_inet.h"
 #include "opt_gateway.h"
@@ -900,11 +900,10 @@ ours:
 		/*
 		 * Prevent TCP blind data attacks by not allowing non-initial
 		 * fragments to start at less than 68 bytes (minimal fragment
-		 * size) and making sure the first fragment is at least 68
-		 * bytes.
+		 * size).
 		 */
-		off = (ntohs(ip->ip_off) & IP_OFFMASK) << 3;
-		if ((off > 0 ? off + hlen : len) < IP_MINFRAGSIZE - 1) {
+		off = htons(ip->ip_off) & ~(IP_DF|IP_EF|IP_MF);
+		if (off > 0 && off + hlen < IP_MINFRAGSIZE - 1) {
 			ipstat.ips_badfrags++;
 			goto bad;
 		}
@@ -918,17 +917,9 @@ ours:
 			if (ip->ip_id == fp->ipq_id &&
 			    in_hosteq(ip->ip_src, fp->ipq_src) &&
 			    in_hosteq(ip->ip_dst, fp->ipq_dst) &&
-			    ip->ip_p == fp->ipq_p) {
-				/*
-				 * Make sure the TOS is matches previous
-				 * fragments.
-				 */
-				if (ip->ip_tos != fp->ipq_tos) {
-					ipstat.ips_badfrags++;
-					goto bad;
-				}
+			    ip->ip_p == fp->ipq_p)
 				goto found;
-			}
+
 		}
 		fp = 0;
 found:
@@ -1124,7 +1115,6 @@ ip_reass(struct ipqent *ipqe, struct ipq
 		fp->ipq_ttl = IPFRAGTTL;
 		fp->ipq_p = ipqe->ipqe_ip->ip_p;
 		fp->ipq_id = ipqe->ipqe_ip->ip_id;
-		fp->ipq_tos = ipqe->ipqe_ip->ip_tos;
 		TAILQ_INIT(&fp->ipq_fragq);
 		fp->ipq_src = ipqe->ipqe_ip->ip_src;
 		fp->ipq_dst = ipqe->ipqe_ip->ip_dst;