Module Name: src Committed By: martin Date: Sat Feb 23 07:16:38 UTC 2019
Modified Files: src/sys/net [netbsd-7-1]: rtsock.c Log Message: Apply patch, requested by sborrill in ticket #1680: sys/net/rtsock.c (apply patch) Fix locking for sysctl_rtable (fix in HEAD will be different). To generate a diff of this commit: cvs rdiff -u -r1.163.8.1 -r1.163.8.2 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.163.8.1 src/sys/net/rtsock.c:1.163.8.2 --- src/sys/net/rtsock.c:1.163.8.1 Wed Nov 28 16:30:57 2018 +++ src/sys/net/rtsock.c Sat Feb 23 07:16:37 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: rtsock.c,v 1.163.8.1 2018/11/28 16:30:57 martin Exp $ */ +/* $NetBSD: rtsock.c,v 1.163.8.2 2019/02/23 07:16:37 martin 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.163.8.1 2018/11/28 16:30:57 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.163.8.2 2019/02/23 07:16:37 martin Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -1408,6 +1408,8 @@ again: w.w_needed = 0 - w.w_given; w.w_where = where; + mutex_enter(softnet_lock); + KERNEL_LOCK(1, NULL); s = splsoftnet(); switch (w.w_op) { @@ -1434,6 +1436,8 @@ again: break; } splx(s); + KERNEL_UNLOCK_ONE(NULL); + mutex_exit(softnet_lock); /* check to see if we couldn't allocate memory with NOWAIT */ if (error == ENOBUFS && w.w_tmem == 0 && w.w_tmemneeded)