diff options
| author |   mpi <mpi@openbsd.org> | 2017-02-14 09:46:21 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2017-02-14 09:46:21 +0000 |
| commit | 1f21cadabd73b17812f0ec5505a60b59ec5eafbd (patch) | |
| tree | 0e25ebca56ee1eed12abe1c40c8d637001e10c49 /sys/kern/sys_socket.c | |
| parent | bump to 2.5.2 (diff) | |
| download | wireguard-openbsd-1f21cadabd73b17812f0ec5505a60b59ec5eafbd.tar.xz wireguard-openbsd-1f21cadabd73b17812f0ec5505a60b59ec5eafbd.zip | |
Wrap the NET_LOCK() into a per-socket solock() that does nothing for
unix domain sockets.
This should prevent the multiple deadlock related to unix domain sockets.
Inputs from millert@ and bluhm@, ok bluhm@
Diffstat (limited to 'sys/kern/sys_socket.c')
| -rw-r--r-- | sys/kern/sys_socket.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c index 5e969cd8164..c8dbe8724a6 100644 --- a/sys/kern/sys_socket.c +++ b/sys/kern/sys_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_socket.c,v 1.28 2017/01/31 12:16:20 mpi Exp $ */ +/* $OpenBSD: sys_socket.c,v 1.29 2017/02/14 09:46:21 mpi Exp $ */ /* $NetBSD: sys_socket.c,v 1.13 1995/08/12 23:59:09 mycroft Exp $ */ /* @@ -127,10 +127,10 @@ soo_ioctl(struct file *fp, u_long cmd, caddr_t data, struct proc *p) } if (IOCGROUP(cmd) == 'r') return (EOPNOTSUPP); - NET_LOCK(s); + s = solock(so); error = ((*so->so_proto->pr_usrreq)(so, PRU_CONTROL, (struct mbuf *)cmd, (struct mbuf *)data, (struct mbuf *)NULL, p)); - NET_UNLOCK(s); + sounlock(s); return (error); } @@ -187,10 +187,10 @@ soo_stat(struct file *fp, struct stat *ub, struct proc *p) ub->st_mode |= S_IWUSR | S_IWGRP | S_IWOTH; ub->st_uid = so->so_euid; ub->st_gid = so->so_egid; - NET_LOCK(s); + s = solock(so); (void) ((*so->so_proto->pr_usrreq)(so, PRU_SENSE, (struct mbuf *)ub, NULL, NULL, p)); - NET_UNLOCK(s); + sounlock(s); return (0); } |