diff options
author | Robert Watson <rwatson@FreeBSD.org> | 2004-11-04 01:17:31 +0000 |
---|---|---|
committer | Robert Watson <rwatson@FreeBSD.org> | 2004-11-04 01:17:31 +0000 |
commit | 80083f9e6f69e10f85fb1db8cd57835025dd58a1 (patch) | |
tree | 2c61ffec7532eaa056d577f4445e5d1b7b2a45ee | |
parent | aea51f27c2363610d94f8e69300785b28501bac0 (diff) | |
download | src-test2-80083f9e6f69e10f85fb1db8cd57835025dd58a1.tar.gz src-test2-80083f9e6f69e10f85fb1db8cd57835025dd58a1.zip |
Merged uipc_socket.c:1.216 from HEAD to RELENG_5_3:
date: 2004/11/02 17:15:13; author: rwatson; state: Exp; lines: +1 -0
Acquire the accept mutex in soabort() before calling sotryfree(), as
that is now required.
RELENG_5_3 candidate.
Foot provided by: Dikshie <dikshie at ppk dot itb dot ac dot id>
Approved by: re (kensmith)
Notes
Notes:
svn path=/releng/5.3/; revision=137175
-rw-r--r-- | sys/kern/uipc_socket.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 1a74cffdd27a..1ed2261bbdd4 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -489,6 +489,7 @@ soabort(so) error = (*so->so_proto->pr_usrreqs->pru_abort)(so); if (error) { + ACCEPT_LOCK(); SOCK_LOCK(so); sotryfree(so); /* note: does not decrement the ref count */ return error; |