Module Name: src
Committed By: maxv
Date: Tue Feb 26 06:52:34 UTC 2019
Modified Files:
src/sys/netipsec: keysock.c
Log Message:
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@
Reported-by: [email protected]
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 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.68 src/sys/netipsec/keysock.c:1.69
--- src/sys/netipsec/keysock.c:1.68 Sun Jan 27 02:08:48 2019
+++ src/sys/netipsec/keysock.c Tue Feb 26 06:52:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: keysock.c,v 1.68 2019/01/27 02:08:48 pgoyette Exp $ */
+/* $NetBSD: keysock.c,v 1.69 2019/02/26 06:52:34 maxv Exp $ */
/* $FreeBSD: 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.68 2019/01/27 02:08:48 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: keysock.c,v 1.69 2019/02/26 06:52:34 maxv Exp $");
/* This code has derived from sys/net/rtsock.c on FreeBSD2.2.5 */
@@ -383,10 +383,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) {
