ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch '1046-deadlock-in-tcp-code' into 'master'

Browse Source 
Fix a possible deadlock in TCP accepting

Closes #1046

See merge request isc-projects/bind9!1958
This commit is contained in:
Witold Krecicki
2019-05-24 03:29:44 -04:00
parent 4d498b3dac 75815c1581
commit 571f0beee0
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -1,3 +1,5 @@
5238. [bug] Fix a possible deadlock in TCP code. [GL #1046]
5237. [bug] Recurse to find the root server list with 'dig +trace'.
[GL #1028]

15
lib/isc/unix/socket.c
View File

@@ -2977,6 +2977,13 @@ internal_accept(isc__socket_t *sock) {
NEWCONNSOCK(dev)->connected = 1;
nthread = &manager->threads[NEWCONNSOCK(dev)->threadid];
/*
* We already hold a lock on one fdlock in accepting thread,
* we need to make sure that we don't double lock.
*/
bool same_bucket = (sock->threadid == NEWCONNSOCK(dev)->threadid) &&
(FDLOCK_ID(sock->fd) == lockid);
/*
* Use minimum mtu if possible.
*/
@@ -2999,13 +3006,17 @@ internal_accept(isc__socket_t *sock) {
NEWCONNSOCK(dev)->active = 1;
}
LOCK(&nthread->fdlock[lockid]);
if (!same_bucket) {
LOCK(&nthread->fdlock[lockid]);
}
nthread->fds[fd] = NEWCONNSOCK(dev);
nthread->fdstate[fd] = MANAGED;
#if defined(USE_EPOLL)
nthread->epoll_events[fd] = 0;
#endif
UNLOCK(&nthread->fdlock[lockid]);
if (!same_bucket) {
UNLOCK(&nthread->fdlock[lockid]);
}
LOCK(&manager->lock);