[src/trunk]: src/sys/netinet6 CID 1362905: Initialize ifp early, so that we d...

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

details:   https://anonhg.NetBSD.org/src/rev/e985f9435f16
branches:  trunk
changeset: 346130:e985f9435f16
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Jun 27 18:35:54 2016 +0000

description:
CID 1362905: Initialize ifp early, so that we don't if_put garbage in the
IPSEC case.

diffstat:

 sys/netinet6/ip6_output.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r 1744cdb19cb4 -r e985f9435f16 sys/netinet6/ip6_output.c
--- a/sys/netinet6/ip6_output.c Mon Jun 27 18:27:51 2016 +0000
+++ b/sys/netinet6/ip6_output.c Mon Jun 27 18:35:54 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip6_output.c,v 1.170 2016/06/21 10:25:27 ozaki-r Exp $ */
+/*     $NetBSD: ip6_output.c,v 1.171 2016/06/27 18:35:54 christos Exp $        */
 /*     $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $    */
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.170 2016/06/21 10:25:27 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.171 2016/06/27 18:35:54 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -163,7 +163,7 @@
 )
 {
        struct ip6_hdr *ip6, *mhip6;
-       struct ifnet *ifp, *origifp = NULL;
+       struct ifnet *ifp = NULL, *origifp = NULL;
        struct mbuf *m = m0;
        int hlen, tlen, len, off;
        bool tso;
@@ -491,7 +491,6 @@
        ip6 = mtod(m, struct ip6_hdr *);
 
        sockaddr_in6_init(&dst_sa, &ip6->ip6_dst, 0, 0, 0);
-       ifp = NULL;
        if ((error = in6_selectroute(&dst_sa, opt, im6o, ro,
            &ifp, &psref, &rt, 0)) != 0) {
                if (ifp != NULL)