Module Name: src
Committed By: martin
Date: Mon Jul 15 08:18:50 UTC 2019
Modified Files:
src/sys/netipsec [netbsd-8]: keysock.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1287):
sys/netipsec/keysock.c: revision 1.69
Fix locking: it is fine if the lock is already key_so_mtx, this can happen
in socketpair. In that case don't take it.
Ok ozaki-r@
To generate a diff of this commit:
cvs rdiff -u -r1.58.2.3 -r1.58.2.4 src/sys/netipsec/keysock.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/netipsec/keysock.c
diff -u src/sys/netipsec/keysock.c:1.58.2.3 src/sys/netipsec/keysock.c:1.58.2.4
--- src/sys/netipsec/keysock.c:1.58.2.3 Mon Nov 12 12:23:20 2018
+++ src/sys/netipsec/keysock.c Mon Jul 15 08:18:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: keysock.c,v 1.58.2.3 2018/11/12 12:23:20 martin Exp $ */
+/* $NetBSD: keysock.c,v 1.58.2.4 2019/07/15 08:18:50 martin Exp $ */
/* $FreeBSD: src/sys/netipsec/keysock.c,v 1.3.2.1 2003/01/24 05:11:36 sam Exp $ */
/* $KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $ */
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: keysock.c,v 1.58.2.3 2018/11/12 12:23:20 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: keysock.c,v 1.58.2.4 2019/07/15 08:18:50 martin Exp $");
/* This code has derived from sys/net/rtsock.c on FreeBSD2.2.5 */
@@ -475,10 +475,12 @@ key_attach(struct socket *so, int proto)
s = splsoftnet();
- KASSERT(so->so_lock == NULL);
- mutex_obj_hold(key_so_mtx);
- so->so_lock = key_so_mtx;
- solock(so);
+ if (so->so_lock != key_so_mtx) {
+ KASSERT(so->so_lock == NULL);
+ mutex_obj_hold(key_so_mtx);
+ so->so_lock = key_so_mtx;
+ solock(so);
+ }
error = raw_attach(so, proto, &key_rawcb);
if (error) {
