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

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

details:   https://anonhg.NetBSD.org/src/rev/3f9c4f066184
branches:  netbsd-6
changeset: 777295:3f9c4f066184
user:      snj <snj%NetBSD.org@localhost>
date:      Tue Mar 13 16:43:06 2018 +0000

description:
Pull up following revision(s) (requested by ozaki-r in ticket #1518):
        sys/netinet6/ip6_forward.c: 1.89-1.90 via patch
Fix use-after-free of mbuf by ip6flow_create
This fixes recent failures of some ATF tests such as t_ipsec_tunnel_odd.
--
Fix use-after-free of mbuf by ip6flow_create (one more)

diffstat:

 sys/netinet6/ip6_forward.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r c6d74385973d -r 3f9c4f066184 sys/netinet6/ip6_forward.c
--- a/sys/netinet6/ip6_forward.c        Tue Mar 13 16:38:28 2018 +0000
+++ b/sys/netinet6/ip6_forward.c        Tue Mar 13 16:43:06 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip6_forward.c,v 1.69 2011/12/19 11:59:58 drochner Exp $        */
+/*     $NetBSD: ip6_forward.c,v 1.69.2.1 2018/03/13 16:43:06 snj Exp $ */
 /*     $KAME: ip6_forward.c,v 1.109 2002/09/11 08:10:17 sakane Exp $   */
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_forward.c,v 1.69 2011/12/19 11:59:58 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_forward.c,v 1.69.2.1 2018/03/13 16:43:06 snj Exp $");
 
 #include "opt_gateway.h"
 #include "opt_ipsec.h"
@@ -645,8 +645,8 @@
                        IP6_STATINC(IP6_STAT_REDIRECTSENT);
                else {
 #ifdef GATEWAY
-                       if (m->m_flags & M_CANFASTFWD)
-                               ip6flow_create(&ip6_forward_rt, m);
+                       if (mcopy->m_flags & M_CANFASTFWD)
+                               ip6flow_create(&ip6_forward_rt, mcopy);
 #endif
                        if (mcopy)
                                goto freecopy;