CVS commit: [netbsd-6] src/sys/net/npf

[Jeff Rizzo]

Module Name:    src
Committed By:   riz
Date:           Tue Oct  9 23:49:03 UTC 2012

Modified Files:
        src/sys/net/npf [netbsd-6]: npf_handler.c

Log Message:
Pull up following revision(s) (requested by rmind in ticket #594):
        sys/net/npf/npf_handler.c: revision 1.23
npf_packet_handler: drop the packet if IPv6 reassembly did not work.


To generate a diff of this commit:
cvs rdiff -u -r1.13.2.5 -r1.13.2.6 src/sys/net/npf/npf_handler.c

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


Modified files:

Index: src/sys/net/npf/npf_handler.c
diff -u src/sys/net/npf/npf_handler.c:1.13.2.5 src/sys/net/npf/npf_handler.c:1.13.2.6
--- src/sys/net/npf/npf_handler.c:1.13.2.5	Mon Aug 13 17:49:52 2012
+++ src/sys/net/npf/npf_handler.c	Tue Oct  9 23:49:03 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: npf_handler.c,v 1.13.2.5 2012/08/13 17:49:52 riz Exp $	*/
+/*	$NetBSD: npf_handler.c,v 1.13.2.6 2012/10/09 23:49:03 riz Exp $	*/
 
 /*-
  * Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_handler.c,v 1.13.2.5 2012/08/13 17:49:52 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_handler.c,v 1.13.2.6 2012/10/09 23:49:03 riz Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -136,8 +136,10 @@ npf_packet_handler(void *arg, struct mbu
 		nbuf = (nbuf_t *)*mp;
 		npc.npc_info = 0;
 
-		int ret __unused = npf_cache_all(&npc, nbuf);
-		KASSERT((ret & NPC_IPFRAG) == 0);
+		if (npf_cache_all(&npc, nbuf) & NPC_IPFRAG) {
+			se = NULL;
+			goto out;
+		}
 		npf_stats_inc(NPF_STAT_REASSEMBLY);
 	}