Module Name: src
Committed By: ozaki-r
Date: Fri Feb 17 04:32:10 UTC 2017
Modified Files:
src/sys/netinet: ip_icmp.c ip_icmp.h ip_input.c
Log Message:
Protect sysctl_net_inet_ip_pmtudto with icmp_mtx instead of softnet_lock
To generate a diff of this commit:
cvs rdiff -u -r1.158 -r1.159 src/sys/netinet/ip_icmp.c
cvs rdiff -u -r1.34 -r1.35 src/sys/netinet/ip_icmp.h
cvs rdiff -u -r1.349 -r1.350 src/sys/netinet/ip_input.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/ip_icmp.c
diff -u src/sys/netinet/ip_icmp.c:1.158 src/sys/netinet/ip_icmp.c:1.159
--- src/sys/netinet/ip_icmp.c:1.158 Mon Feb 13 07:18:20 2017
+++ src/sys/netinet/ip_icmp.c Fri Feb 17 04:32:10 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_icmp.c,v 1.158 2017/02/13 07:18:20 ozaki-r Exp $ */
+/* $NetBSD: ip_icmp.c,v 1.159 2017/02/17 04:32:10 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -94,7 +94,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_icmp.c,v 1.158 2017/02/13 07:18:20 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_icmp.c,v 1.159 2017/02/17 04:32:10 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@@ -205,6 +205,20 @@ icmp_init(void)
icmp_wqinput = wqinput_create("icmp", _icmp_input);
}
+void
+icmp_mtudisc_lock(void)
+{
+
+ mutex_enter(&icmp_mtx);
+}
+
+void
+icmp_mtudisc_unlock(void)
+{
+
+ mutex_exit(&icmp_mtx);
+}
+
/*
* Register a Path MTU Discovery callback.
*/
Index: src/sys/netinet/ip_icmp.h
diff -u src/sys/netinet/ip_icmp.h:1.34 src/sys/netinet/ip_icmp.h:1.35
--- src/sys/netinet/ip_icmp.h:1.34 Wed Feb 18 17:00:15 2015
+++ src/sys/netinet/ip_icmp.h Fri Feb 17 04:32:10 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_icmp.h,v 1.34 2015/02/18 17:00:15 christos Exp $ */
+/* $NetBSD: ip_icmp.h,v 1.35 2017/02/17 04:32:10 ozaki-r Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -248,6 +248,8 @@ int icmp_sysctl(int *, u_int, void *, si
void icmp_mtudisc_callback_register(void (*)(struct in_addr));
int icmp_ratelimit(const struct in_addr *, const int, const int);
+void icmp_mtudisc_lock(void);
+void icmp_mtudisc_unlock(void);
#endif
Index: src/sys/netinet/ip_input.c
diff -u src/sys/netinet/ip_input.c:1.349 src/sys/netinet/ip_input.c:1.350
--- src/sys/netinet/ip_input.c:1.349 Tue Feb 7 02:38:08 2017
+++ src/sys/netinet/ip_input.c Fri Feb 17 04:32:10 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_input.c,v 1.349 2017/02/07 02:38:08 ozaki-r Exp $ */
+/* $NetBSD: ip_input.c,v 1.350 2017/02/17 04:32:10 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.349 2017/02/07 02:38:08 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.350 2017/02/17 04:32:10 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1601,24 +1601,25 @@ sysctl_net_inet_ip_pmtudto(SYSCTLFN_ARGS
int error, tmp;
struct sysctlnode node;
+ icmp_mtudisc_lock();
+
node = *rnode;
tmp = ip_mtudisc_timeout;
node.sysctl_data = &tmp;
error = sysctl_lookup(SYSCTLFN_CALL(&node));
if (error || newp == NULL)
- return (error);
- if (tmp < 0)
- return (EINVAL);
-
- /* XXX NOMPSAFE still need softnet_lock */
- mutex_enter(softnet_lock);
+ goto out;
+ if (tmp < 0) {
+ error = EINVAL;
+ goto out;
+ }
ip_mtudisc_timeout = tmp;
rt_timer_queue_change(ip_mtudisc_timeout_q, ip_mtudisc_timeout);
-
- mutex_exit(softnet_lock);
-
- return (0);
+ error = 0;
+out:
+ icmp_mtudisc_unlock();
+ return 0;
}
static int
