[src/trunk]: src/sys/net/npf npf_packet_handler: drop the packet if IPv6 reas...

[rmind <rmind%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d54ae4ff227e
branches:  trunk
changeset: 781920:d54ae4ff227e
user:      rmind <rmind%NetBSD.org@localhost>
date:      Sat Oct 06 23:38:20 2012 +0000

description:
npf_packet_handler: drop the packet if IPv6 reassembly did not work.

diffstat:

 sys/net/npf/npf_handler.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r 83f0120570c4 -r d54ae4ff227e sys/net/npf/npf_handler.c
--- a/sys/net/npf/npf_handler.c Sat Oct 06 22:58:08 2012 +0000
+++ b/sys/net/npf/npf_handler.c Sat Oct 06 23:38:20 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: npf_handler.c,v 1.22 2012/09/16 13:47:41 rmind Exp $   */
+/*     $NetBSD: npf_handler.c,v 1.23 2012/10/06 23:38:20 rmind 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.22 2012/09/16 13:47:41 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_handler.c,v 1.23 2012/10/06 23:38:20 rmind Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -136,8 +136,10 @@
                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);
        }