Module Name: src
Committed By: martin
Date: Mon Sep 30 15:48:45 UTC 2019
Modified Files:
src/sys/netinet [netbsd-8]: if_arp.c
src/sys/netinet6 [netbsd-8]: nd6.c nd6.h nd6_nbr.c
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1396):
sys/netinet6/nd6.h: revision 1.88
sys/netinet6/nd6_nbr.c: revision 1.174
sys/netinet6/nd6.c: revision 1.264
sys/netinet/if_arp.c: revision 1.288 (patch)
Initialize DAD components properly
The original code initialized each component in non-init functions such as
arp_dad_start and nd6_dad_find, conditionally based on a global flag for each.
However, it was racy because the flag and the code around it were not
protected by a lock and could cause a kernel panic at worst.
Fix the issue by initializing the components in bootup as usual.
To generate a diff of this commit:
cvs rdiff -u -r1.250.2.9 -r1.250.2.10 src/sys/netinet/if_arp.c
cvs rdiff -u -r1.232.2.12 -r1.232.2.13 src/sys/netinet6/nd6.c
cvs rdiff -u -r1.83.6.1 -r1.83.6.2 src/sys/netinet6/nd6.h
cvs rdiff -u -r1.138.6.8 -r1.138.6.9 src/sys/netinet6/nd6_nbr.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/netinet/if_arp.c
diff -u src/sys/netinet/if_arp.c:1.250.2.9 src/sys/netinet/if_arp.c:1.250.2.10
--- src/sys/netinet/if_arp.c:1.250.2.9 Tue Nov 6 14:38:58 2018
+++ src/sys/netinet/if_arp.c Mon Sep 30 15:48:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arp.c,v 1.250.2.9 2018/11/06 14:38:58 martin Exp $ */
+/* $NetBSD: if_arp.c,v 1.250.2.10 2019/09/30 15:48:45 martin Exp $ */
/*-
* Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.250.2.9 2018/11/06 14:38:58 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.250.2.10 2019/09/30 15:48:45 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -154,6 +154,7 @@ int arp_debug = 0;
#endif
static void arp_init(void);
+static void arp_dad_init(void);
static void arprequest(struct ifnet *,
const struct in_addr *, const struct in_addr *,
@@ -288,6 +289,8 @@ arp_init(void)
sysctl_net_inet_arp_setup(NULL);
arpstat_percpu = percpu_alloc(sizeof(uint64_t) * ARP_NSTATS);
IFQ_LOCK_INIT(&arpintrq);
+
+ arp_dad_init();
}
static void
@@ -1517,10 +1520,17 @@ struct dadq {
};
static struct dadq_head dadq;
-static int dad_init = 0;
static int dad_maxtry = 15; /* max # of *tries* to transmit DAD packet */
static kmutex_t arp_dad_lock;
+static void
+arp_dad_init(void)
+{
+
+ TAILQ_INIT(&dadq);
+ mutex_init(&arp_dad_lock, MUTEX_DEFAULT, IPL_NONE);
+}
+
static struct dadq *
arp_dad_find(struct ifaddr *ifa)
{
@@ -1595,12 +1605,6 @@ arp_dad_start(struct ifaddr *ifa)
struct dadq *dp;
char ipbuf[INET_ADDRSTRLEN];
- if (!dad_init) {
- TAILQ_INIT(&dadq);
- mutex_init(&arp_dad_lock, MUTEX_DEFAULT, IPL_NONE);
- dad_init++;
- }
-
/*
* If we don't need DAD, don't do it.
* - DAD is disabled (ip_dad_count == 0)
@@ -1669,9 +1673,6 @@ arp_dad_stop(struct ifaddr *ifa)
{
struct dadq *dp;
- if (!dad_init)
- return;
-
mutex_enter(&arp_dad_lock);
dp = arp_dad_find(ifa);
if (dp == NULL) {
Index: src/sys/netinet6/nd6.c
diff -u src/sys/netinet6/nd6.c:1.232.2.12 src/sys/netinet6/nd6.c:1.232.2.13
--- src/sys/netinet6/nd6.c:1.232.2.12 Mon Aug 19 14:28:12 2019
+++ src/sys/netinet6/nd6.c Mon Sep 30 15:48:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6.c,v 1.232.2.12 2019/08/19 14:28:12 martin Exp $ */
+/* $NetBSD: nd6.c,v 1.232.2.13 2019/09/30 15:48:45 martin Exp $ */
/* $KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.232.2.12 2019/08/19 14:28:12 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.232.2.13 2019/09/30 15:48:45 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -139,6 +139,8 @@ nd6_init(void)
{
int error;
+ nd6_nbr_init();
+
rw_init(&nd6_lock);
/* initialization of the default router list */
Index: src/sys/netinet6/nd6.h
diff -u src/sys/netinet6/nd6.h:1.83.6.1 src/sys/netinet6/nd6.h:1.83.6.2
--- src/sys/netinet6/nd6.h:1.83.6.1 Fri Jul 7 13:57:26 2017
+++ src/sys/netinet6/nd6.h Mon Sep 30 15:48:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6.h,v 1.83.6.1 2017/07/07 13:57:26 martin Exp $ */
+/* $NetBSD: nd6.h,v 1.83.6.2 2019/09/30 15:48:45 martin Exp $ */
/* $KAME: nd6.h,v 1.95 2002/06/08 11:31:06 itojun Exp $ */
/*
@@ -426,6 +426,7 @@ union nd_opts {
/* XXX: need nd6_var.h?? */
/* nd6.c */
void nd6_init(void);
+void nd6_nbr_init(void);
struct nd_ifinfo *nd6_ifattach(struct ifnet *);
void nd6_ifdetach(struct ifnet *, struct in6_ifextra *);
int nd6_is_addr_neighbor(const struct sockaddr_in6 *, struct ifnet *);
Index: src/sys/netinet6/nd6_nbr.c
diff -u src/sys/netinet6/nd6_nbr.c:1.138.6.8 src/sys/netinet6/nd6_nbr.c:1.138.6.9
--- src/sys/netinet6/nd6_nbr.c:1.138.6.8 Mon Sep 23 08:17:24 2019
+++ src/sys/netinet6/nd6_nbr.c Mon Sep 30 15:48:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6_nbr.c,v 1.138.6.8 2019/09/23 08:17:24 martin Exp $ */
+/* $NetBSD: nd6_nbr.c,v 1.138.6.9 2019/09/30 15:48:45 martin Exp $ */
/* $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.138.6.8 2019/09/23 08:17:24 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.138.6.9 2019/09/30 15:48:45 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1076,9 +1076,16 @@ struct dadq {
};
static struct dadq_head dadq;
-static int dad_init = 0;
static kmutex_t nd6_dad_lock;
+void
+nd6_nbr_init(void)
+{
+
+ TAILQ_INIT(&dadq);
+ mutex_init(&nd6_dad_lock, MUTEX_DEFAULT, IPL_NONE);
+}
+
static struct dadq *
nd6_dad_find(struct ifaddr *ifa)
{
@@ -1136,12 +1143,6 @@ nd6_dad_start(struct ifaddr *ifa, int xt
struct dadq *dp;
char ip6buf[INET6_ADDRSTRLEN];
- if (!dad_init) {
- TAILQ_INIT(&dadq);
- mutex_init(&nd6_dad_lock, MUTEX_DEFAULT, IPL_NONE);
- dad_init++;
- }
-
/*
* If we don't need DAD, don't do it.
* There are several cases:
@@ -1219,9 +1220,6 @@ nd6_dad_stop(struct ifaddr *ifa)
{
struct dadq *dp;
- if (!dad_init)
- return;
-
mutex_enter(&nd6_dad_lock);
dp = nd6_dad_find(ifa);
if (dp == NULL) {
