Module Name: src
Committed By: knakahara
Date: Mon Jan 8 23:23:25 UTC 2018
Modified Files:
src/sys/netinet6: ip6_flow.c
src/sys/opencrypto: crypto.c
Log Message:
Fix PR kern/52910. Reported and implemented a patch by Sevan Janiyan, thanks.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/netinet6/ip6_flow.c
cvs rdiff -u -r1.102 -r1.103 src/sys/opencrypto/crypto.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/ip6_flow.c
diff -u src/sys/netinet6/ip6_flow.c:1.36 src/sys/netinet6/ip6_flow.c:1.37
--- src/sys/netinet6/ip6_flow.c:1.36 Sun Dec 10 09:06:46 2017
+++ src/sys/netinet6/ip6_flow.c Mon Jan 8 23:23:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_flow.c,v 1.36 2017/12/10 09:06:46 maxv Exp $ */
+/* $NetBSD: ip6_flow.c,v 1.37 2018/01/08 23:23:25 knakahara Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_flow.c,v 1.36 2017/12/10 09:06:46 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_flow.c,v 1.37 2018/01/08 23:23:25 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -560,6 +560,8 @@ ip6flow_create(struct route *ro, struct
struct ip6flow *ip6f;
size_t hash;
+ printf("XXXX %s: enter\n", __func__);
+
ip6 = mtod(m, const struct ip6_hdr *);
KERNEL_LOCK_UNLESS_NET_MPSAFE();
@@ -571,8 +573,12 @@ ip6flow_create(struct route *ro, struct
*
* Don't create a flow for ICMPv6 messages.
*/
- if (ip6_maxflows == 0 || ip6->ip6_nxt == IPPROTO_IPV6_ICMP)
+ if (ip6_maxflows == 0 || ip6->ip6_nxt == IPPROTO_IPV6_ICMP) {
+ printf("XXXX %s: icmp skip\n", __func__);
goto out;
+ }
+
+ printf("XXXX %s: ip6->ip6_nxt=%d\n", __func__, ip6->ip6_nxt);
/*
* See if an existing flow exists. If so:
Index: src/sys/opencrypto/crypto.c
diff -u src/sys/opencrypto/crypto.c:1.102 src/sys/opencrypto/crypto.c:1.103
--- src/sys/opencrypto/crypto.c:1.102 Thu Nov 9 22:20:25 2017
+++ src/sys/opencrypto/crypto.c Mon Jan 8 23:23:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: crypto.c,v 1.102 2017/11/09 22:20:25 christos Exp $ */
+/* $NetBSD: crypto.c,v 1.103 2018/01/08 23:23:25 knakahara Exp $ */
/* $FreeBSD: src/sys/opencrypto/crypto.c,v 1.4.2.5 2003/02/26 00:14:05 sam Exp $ */
/* $OpenBSD: crypto.c,v 1.41 2002/07/17 23:52:38 art Exp $ */
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: crypto.c,v 1.102 2017/11/09 22:20:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: crypto.c,v 1.103 2018/01/08 23:23:25 knakahara Exp $");
#include <sys/param.h>
#include <sys/reboot.h>
@@ -360,7 +360,7 @@ sysctl_opencrypto_kq_maxlen(SYSCTLFN_ARG
}
/*
- * Crypto op and desciptor data structures are allocated
+ * Crypto op and descriptor data structures are allocated
* from separate private zones(FreeBSD)/pools(netBSD/OpenBSD) .
*/
static pool_cache_t cryptop_cache;
