[src/trunk]: src/sys/netipsec As I said in my last commit in this file, ipo s...

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

details:   https://anonhg.NetBSD.org/src/rev/585a72ec3ea4
branches:  trunk
changeset: 358982:585a72ec3ea4
user:      maxv <maxv%NetBSD.org@localhost>
date:      Wed Jan 24 14:37:34 2018 +0000

description:
As I said in my last commit in this file, ipo should be set to NULL;
otherwise the 'local address spoofing' check below is always wrong on
IPv6.

diffstat:

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

diffs (29 lines):

diff -r 22b594b70aa5 -r 585a72ec3ea4 sys/netipsec/xform_ipip.c
--- a/sys/netipsec/xform_ipip.c Wed Jan 24 14:28:13 2018 +0000
+++ b/sys/netipsec/xform_ipip.c Wed Jan 24 14:37:34 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xform_ipip.c,v 1.56 2018/01/14 16:36:04 maxv Exp $     */
+/*     $NetBSD: xform_ipip.c,v 1.57 2018/01/24 14:37:34 maxv Exp $     */
 /*     $FreeBSD: src/sys/netipsec/xform_ipip.c,v 1.3.2.1 2003/01/24 05:11:36 sam Exp $ */
 /*     $OpenBSD: ip_ipip.c,v 1.25 2002/06/10 18:04:55 itojun Exp $ */
 
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_ipip.c,v 1.56 2018/01/14 16:36:04 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_ipip.c,v 1.57 2018/01/24 14:37:34 maxv Exp $");
 
 /*
  * IP-inside-IP processing
@@ -301,8 +301,8 @@
 #endif /* INET */
 #ifdef INET6
        case 6:
-               ipo = mtod(m, struct ip *);
-               ip6 = (struct ip6_hdr *)ipo;
+               ipo = NULL;
+               ip6 = mtod(m, struct ip6_hdr *);
                itos = (ntohl(ip6->ip6_flow) >> 20) & 0xff;
                ip_ecn_egress(ip6_ipsec_ecn, &otos, &itos);
                ip6->ip6_flow &= ~htonl(0xff << 20);