[src/netbsd-6]: src/sys/net/npf Pull up following revision(s) (requested by r...

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

details:   https://anonhg.NetBSD.org/src/rev/56edeedeaa41
branches:  netbsd-6
changeset: 774643:56edeedeaa41
user:      riz <riz%NetBSD.org@localhost>
date:      Tue Oct 09 23:49:03 2012 +0000

description:
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.

diffstat:

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

diffs (31 lines):

diff -r e2a674ef84b3 -r 56edeedeaa41 sys/net/npf/npf_handler.c
--- a/sys/net/npf/npf_handler.c Tue Oct 09 23:45:21 2012 +0000
+++ b/sys/net/npf/npf_handler.c Tue Oct 09 23:49:03 2012 +0000
@@ -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 @@
                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);
        }