Module Name: src
Committed By: snj
Date: Wed Nov 8 22:24:55 UTC 2017
Modified Files:
src/sys/netinet6 [netbsd-8]: icmp6.c raw_ip6.c
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #350):
sys/netinet6/icmp6.c: revision 1.214
sys/netinet6/raw_ip6.c: revision 1.158
Fix usages of ipsec_used
If IPsec isn't used, we must go back to the normal path.
PR kern/52659
To generate a diff of this commit:
cvs rdiff -u -r1.211.6.2 -r1.211.6.3 src/sys/netinet6/icmp6.c
cvs rdiff -u -r1.157 -r1.157.2.1 src/sys/netinet6/raw_ip6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/icmp6.c
diff -u src/sys/netinet6/icmp6.c:1.211.6.2 src/sys/netinet6/icmp6.c:1.211.6.3
--- src/sys/netinet6/icmp6.c:1.211.6.2 Sat Oct 21 19:43:54 2017
+++ src/sys/netinet6/icmp6.c Wed Nov 8 22:24:55 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: icmp6.c,v 1.211.6.2 2017/10/21 19:43:54 snj Exp $ */
+/* $NetBSD: icmp6.c,v 1.211.6.3 2017/11/08 22:24:55 snj Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.211.6.2 2017/10/21 19:43:54 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.211.6.3 2017/11/08 22:24:55 snj Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2012,7 +2012,8 @@ icmp6_rip6_input(struct mbuf **mp, int o
/*
* Check AH/ESP integrity
*/
- if (ipsec_used && !ipsec6_in_reject(m, last))
+ if (!ipsec_used ||
+ (ipsec_used && !ipsec6_in_reject(m, last)))
#endif /* IPSEC */
if ((n = m_copy(m, 0, (int)M_COPYALL)) != NULL) {
if (last->in6p_flags & IN6P_CONTROLOPTS)
Index: src/sys/netinet6/raw_ip6.c
diff -u src/sys/netinet6/raw_ip6.c:1.157 src/sys/netinet6/raw_ip6.c:1.157.2.1
--- src/sys/netinet6/raw_ip6.c:1.157 Thu Jun 1 02:45:14 2017
+++ src/sys/netinet6/raw_ip6.c Wed Nov 8 22:24:55 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: raw_ip6.c,v 1.157 2017/06/01 02:45:14 chs Exp $ */
+/* $NetBSD: raw_ip6.c,v 1.157.2.1 2017/11/08 22:24:55 snj Exp $ */
/* $KAME: raw_ip6.c,v 1.82 2001/07/23 18:57:56 jinmei Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.157 2017/06/01 02:45:14 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip6.c,v 1.157.2.1 2017/11/08 22:24:55 snj Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@@ -205,7 +205,8 @@ rip6_input(struct mbuf **mp, int *offp,
/*
* Check AH/ESP integrity
*/
- if (ipsec_used && !ipsec6_in_reject(m, last))
+ if (!ipsec_used ||
+ (ipsec_used && !ipsec6_in_reject(m, last)))
#endif /* IPSEC */
if ((n = m_copy(m, 0, (int)M_COPYALL)) != NULL) {
if (last->in6p_flags & IN6P_CONTROLOPTS)
