d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Slightly extend the locking during unload to fully cover the protocol

Browse Source 
deregistration.  This does not entirely close the race but narrows the
even previously extremely small chance of a race some more.
This commit is contained in:
Andre Oppermann 2004-10-19 22:08:13 +00:00
parent 279128e295
commit 2de1a9eb6e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/netinet/ip_divert.c
View File

@ -694,19 +694,20 @@ div_modevent(module_t mod, int type, void *unused)
* connected. Maybe this can be changed later to forcefully
* disconnect any open sockets.
*
* XXXRW: Note that there is a slight race here, as a socket
* could be opened between when we test and when we
* unregister.
* XXXRW: Note that there is a slight race here, as a new
* socket open request could be spinning on the lock and then
* we destroy the lock.
*/
INP_INFO_RLOCK(&divcbinfo);
INP_INFO_WLOCK(&divcbinfo);
n = divcbinfo.ipi_count;
INP_INFO_RUNLOCK(&divcbinfo);
if (n != 0) {
err = EBUSY;
INP_INFO_WUNLOCK(&divcbinfo);
break;
}
ip_divert_ptr = NULL;
err = pf_proto_unregister(PF_INET, IPPROTO_DIVERT, SOCK_RAW);
INP_INFO_WUNLOCK(&divcbinfo);
INP_INFO_LOCK_DESTROY(&divcbinfo);
break;
default: