summaryrefslogtreecommitdiff
path: root/sys/kern/uipc_socket.c
diff options
context:
space:
mode:
authorClaudio Jeker <claudio@cvs.openbsd.org>2021-04-26 08:21:37 +0000
committerClaudio Jeker <claudio@cvs.openbsd.org>2021-04-26 08:21:37 +0000
commite336bfa7b1bcba4765f0c22df5c8d307d28d9ceb (patch)
tree9e816d87e1e036b802df493c6e4498e8cf7c56e6 /sys/kern/uipc_socket.c
parentb338db5dc84dc4ed04246cf7c7eed274924f667c (diff)
Revert per-socket `so_lock' rwlock(9) and use it to protect routing
(PF_ROUTE) sockets. There is a locking issue with timeouts that needs to be fixed. Requested by deraadt@
Diffstat (limited to 'sys/kern/uipc_socket.c')
-rw-r--r--sys/kern/uipc_socket.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index d457f366c09..52b6c474b74 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uipc_socket.c,v 1.257 2021/04/25 00:00:34 mvs Exp $ */
+/* $OpenBSD: uipc_socket.c,v 1.258 2021/04/26 08:21:35 claudio Exp $ */
/* $NetBSD: uipc_socket.c,v 1.21 1996/02/04 02:17:52 christos Exp $ */
/*
@@ -151,7 +151,6 @@ socreate(int dom, struct socket **aso, int type, int proto)
if (prp->pr_type != type)
return (EPROTOTYPE);
so = pool_get(&socket_pool, PR_WAITOK | PR_ZERO);
- rw_init(&so->so_lock, "solock");
sigio_init(&so->so_sigio);
TAILQ_INIT(&so->so_q0);
TAILQ_INIT(&so->so_q);