summaryrefslogtreecommitdiffstats
path: root/sys/net
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2004-10-18 22:19:43 +0000
committerrwatson <rwatson@FreeBSD.org>2004-10-18 22:19:43 +0000
commit4b81ce6dd2658abba782e835143f8008092c1c6f (patch)
treee18ee35e276065c19e56111431141fc111be57fb /sys/net
parentd2f67f65f7a477ab4e37f6a25e978bdd763f830f (diff)
downloadFreeBSD-src-4b81ce6dd2658abba782e835143f8008092c1c6f.zip
FreeBSD-src-4b81ce6dd2658abba782e835143f8008092c1c6f.tar.gz
Push acquisition of the accept mutex out of sofree() into the caller
(sorele()/sotryfree()): - This permits the caller to acquire the accept mutex before the socket mutex, avoiding sofree() having to drop the socket mutex and re-order, which could lead to races permitting more than one thread to enter sofree() after a socket is ready to be free'd. - This also covers clearing of the so_pcb weak socket reference from the protocol to the socket, preventing races in clearing and evaluation of the reference such that sofree() might be called more than once on the same socket. This appears to close a race I was able to easily trigger by repeatedly opening and resetting TCP connections to a host, in which the tcp_close() code called as a result of the RST raced with the close() of the accepted socket in the user process resulting in simultaneous attempts to de-allocate the same socket. The new locking increases the overhead for operations that may potentially free the socket, so we will want to revise the synchronization strategy here as we normalize the reference counting model for sockets. The use of the accept mutex in freeing of sockets that are not listen sockets is primarily motivated by the potential need to remove the socket from the incomplete connection queue on its parent (listen) socket, so cleaning up the reference model here may allow us to substantially weaken the synchronization requirements. RELENG_5_3 candidate. MFC after: 3 days Reviewed by: dwhite Discussed with: gnn, dwhite, green Reported by: Marc UBM Bocklet <ubm at u-boot-man dot de> Reported by: Vlad <marchenko at gmail dot com>
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/raw_cb.c1
-rw-r--r--sys/net/raw_usrreq.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c
index 04b4516..b6ab208 100644
--- a/sys/net/raw_cb.c
+++ b/sys/net/raw_cb.c
@@ -98,6 +98,7 @@ raw_detach(rp)
{
struct socket *so = rp->rcb_socket;
+ ACCEPT_LOCK();
SOCK_LOCK(so);
so->so_pcb = 0;
sotryfree(so);
diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c
index 7517743..f444b57 100644
--- a/sys/net/raw_usrreq.c
+++ b/sys/net/raw_usrreq.c
@@ -147,6 +147,7 @@ raw_uabort(struct socket *so)
return EINVAL;
raw_disconnect(rp);
soisdisconnected(so);
+ ACCEPT_LOCK();
SOCK_LOCK(so);
sotryfree(so);
return 0;
OpenPOWER on IntegriCloud