Module Name: src Committed By: ozaki-r Date: Wed Feb 27 04:03:06 UTC 2019
Modified Files: src/sys/net: rtsock.c Log Message: Protect sysctl_rtable with KERNEL_LOCK and softnet_lock In the function the routing table could be accessed without any locks, which was unsafe. Actually, on netbsd-7, a kernel panic happened(*). The situation of locking hasn't changed since netbsd-7 so we still need to hold the big locks on -current (and netbsd-8) too. Note that if NET_MPSAFE is enabled, the routing table is protected by its own lock and we don't need the locks. Reported and tested on netbsd-7 by sborrill@ (*) http://mail-index.netbsd.org/tech-net/2018/11/08/msg007153.html To generate a diff of this commit: cvs rdiff -u -r1.246 -r1.247 src/sys/net/rtsock.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/net/rtsock.c diff -u src/sys/net/rtsock.c:1.246 src/sys/net/rtsock.c:1.247 --- src/sys/net/rtsock.c:1.246 Tue Jan 29 09:28:51 2019 +++ src/sys/net/rtsock.c Wed Feb 27 04:03:06 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: rtsock.c,v 1.246 2019/01/29 09:28:51 pgoyette Exp $ */ +/* $NetBSD: rtsock.c,v 1.247 2019/02/27 04:03:06 ozaki-r Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.246 2019/01/29 09:28:51 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.247 2019/02/27 04:03:06 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -432,6 +432,7 @@ again: w.w_needed = 0 - w.w_given; w.w_where = where; + SOFTNET_KERNEL_LOCK_UNLESS_NET_MPSAFE(); s = splsoftnet(); switch (w.w_op) { @@ -478,6 +479,7 @@ again: break; } splx(s); + SOFTNET_KERNEL_UNLOCK_UNLESS_NET_MPSAFE(); /* check to see if we couldn't allocate memory with NOWAIT */ if (error == ENOBUFS && w.w_tmem == 0 && w.w_tmemneeded)