diff options
| author | Visa Hankala <visa@cvs.openbsd.org> | 2020-06-10 13:24:58 +0000 |
|---|---|---|
| committer | Visa Hankala <visa@cvs.openbsd.org> | 2020-06-10 13:24:58 +0000 |
| commit | 9bb7b1d63972492787c085e0cac82788ae0bde36 (patch) | |
| tree | ef91379f5253277d60ee8ef9211e82dbcdd7094a | |
| parent | 8c28a495858f6d7d485718aa970e8b41c8b823c8 (diff) | |
Move closef() outside fdplock() in sys_socketpair(). This prevents
a lock order problem with altered locking of UNIX domain sockets.
closef() does not need the file descriptor table lock.
From Vitaliy Makkoveev
OK mpi@
| -rw-r--r-- | sys/kern/uipc_syscalls.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index b898bab546e..6cd0cb04282 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_syscalls.c,v 1.185 2020/05/28 07:17:50 mpi Exp $ */ +/* $OpenBSD: uipc_syscalls.c,v 1.186 2020/06/10 13:24:57 visa Exp $ */ /* $NetBSD: uipc_syscalls.c,v 1.19 1996/02/09 19:00:48 christos Exp $ */ /* @@ -420,7 +420,7 @@ sys_socketpair(struct proc *p, void *v, register_t *retval) syscallarg(int *) rsv; } */ *uap = v; struct filedesc *fdp = p->p_fd; - struct file *fp1, *fp2; + struct file *fp1 = NULL, *fp2 = NULL; struct socket *so1, *so2; int type, cloexec, nonblock, fflag, error, sv[2]; @@ -475,14 +475,19 @@ sys_socketpair(struct proc *p, void *v, register_t *retval) return (0); } fdremove(fdp, sv[1]); - closef(fp2, p); - so2 = NULL; free4: fdremove(fdp, sv[0]); - closef(fp1, p); - so1 = NULL; free3: fdpunlock(fdp); + + if (fp2 != NULL) { + closef(fp2, p); + so2 = NULL; + } + if (fp1 != NULL) { + closef(fp1, p); + so1 = NULL; + } free2: if (so2 != NULL) (void)soclose(so2, 0); |