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

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

details:   https://anonhg.NetBSD.org/src/rev/4a1a784e2f11
branches:  netbsd-8
changeset: 320508:4a1a784e2f11
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Jul 10 14:44:05 2018 +0000

description:
Pull up following revision(s) (requested by maxv in ticket #919):

        sys/net/npf/npf_handler.c: revision 1.41

Update the pointer when fast-kicking, because it may have been freed.

Before my changes the nonsensical pointer ininitialization held, but
when I started introducing sanity checks the whole thing collapsed.

Need pullup-8.

diffstat:

 sys/net/npf/npf_handler.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r c9554ee5c406 -r 4a1a784e2f11 sys/net/npf/npf_handler.c
--- a/sys/net/npf/npf_handler.c Tue Jul 10 14:41:31 2018 +0000
+++ b/sys/net/npf/npf_handler.c Tue Jul 10 14:44:05 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: npf_handler.c,v 1.37.6.1 2018/05/09 15:35:37 martin Exp $      */
+/*     $NetBSD: npf_handler.c,v 1.37.6.2 2018/07/10 14:44:05 martin Exp $      */
 
 /*-
  * Copyright (c) 2009-2013 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 
 #ifdef _KERNEL
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_handler.c,v 1.37.6.1 2018/05/09 15:35:37 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_handler.c,v 1.37.6.2 2018/07/10 14:44:05 martin Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -159,6 +159,7 @@
 
        /* If error on the format, leave quickly. */
        if (flags & NPC_FMTERR) {
+               *mp = nbuf_head_mbuf(&nbuf);
                error = EINVAL;
                goto fastout;
        }