mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 13:38:26 +00:00
Code Issues Releases Wiki Activity

Merge branch 'wpk/fix-interface-reconfig-crashes' into 'master'

Browse Source 
Fix interface reconfig crashes

See merge request isc-projects/bind9!2898
This commit is contained in:
Witold Krecicki 2020-01-15 16:56:55 +00:00
commit 4c1adf96de
4 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/isc/netmgr/netmgr-int.h
View File

@ -347,7 +347,10 @@ struct isc_nmsocket {
int tid;
isc_nmsocket_type type;
isc_nm_t *mgr;
/*% Parent socket for multithreaded listeners */
isc_nmsocket_t *parent;
/*% Listener socket this connection was accepted on */
isc_nmsocket_t *listener;
/*%
* quota is the TCP client, attached when a TCP connection

7
lib/isc/netmgr/netmgr.c
View File

@ -760,8 +760,11 @@ nmsocket_cleanup(isc_nmsocket_t *sock, bool dofree) {
if (sock->timer_initialized) {
sock->timer_initialized = false;
uv_timer_stop(&sock->timer);
uv_close((uv_handle_t *)&sock->timer, NULL);
/* We might be in timer callback */
if (!uv_is_closing((uv_handle_t *) &sock->timer)) {
uv_timer_stop(&sock->timer);
uv_close((uv_handle_t *)&sock->timer, NULL);
}
}
isc_astack_destroy(sock->inactivehandles);

26
lib/isc/netmgr/tcpdns.c
View File

@ -121,10 +121,8 @@ dnslisten_acceptcb(isc_nmhandle_t *handle, isc_result_t result, void *cbarg) {
isc__nmsocket_init(dnssock, handle->sock->mgr,
isc_nm_tcpdnssocket, handle->sock->iface);
/* We need to copy read callbacks from outer socket */
dnssock->rcb.recv = dnslistensock->rcb.recv;
dnssock->rcbarg = dnslistensock->rcbarg;
dnssock->extrahandlesize = dnslistensock->extrahandlesize;
isc_nmsocket_attach(dnslistensock, &dnssock->listener);
isc_nmsocket_attach(handle->sock, &dnssock->outer);
dnssock->peer = handle->sock->peer;
dnssock->read_timeout = handle->sock->mgr->init;
@ -171,14 +169,17 @@ processbuffer(isc_nmsocket_t *dnssock, isc_nmhandle_t **handlep) {
*/
len = dnslen(dnssock->buf);
if (len <= dnssock->buf_len - 2) {
isc_nmhandle_t *dnshandle = NULL;
isc_region_t r2 = {
.base = dnssock->buf + 2,
.length = len
};
isc_nmhandle_t *dnshandle = isc__nmhandle_get(dnssock,
NULL, NULL);
isc_nmsocket_t *listener = dnssock->listener;
dnshandle = isc__nmhandle_get(dnssock, NULL, NULL);
dnssock->rcb.recv(dnshandle, &r2, dnssock->rcbarg);
if (listener != NULL && listener->rcb.recv != NULL) {
listener->rcb.recv(dnshandle,
&(isc_region_t){
.base = dnssock->buf + 2,
.length = len
}, listener->rcbarg);
}
len += 2;
dnssock->buf_len -= len;
@ -322,6 +323,8 @@ isc_nm_tcpdns_stoplistening(isc_nmsocket_t *sock) {
atomic_store(&sock->listening, false);
atomic_store(&sock->closed, true);
sock->rcb.recv = NULL;
sock->rcbarg = NULL;
if (sock->outer != NULL) {
isc_nm_tcp_stoplistening(sock->outer);
@ -502,6 +505,9 @@ tcpdns_close_direct(isc_nmsocket_t *sock) {
sock->outer->rcb.recv = NULL;
isc_nmsocket_detach(&sock->outer);
}
if (sock->listener != NULL) {
isc_nmsocket_detach(&sock->listener);
}
/* We don't need atomics here, it's all in single network thread */
if (sock->timer_initialized) {
sock->timer_initialized = false;

5
lib/ns/client.c
View File

@ -1625,6 +1625,11 @@ ns__client_request(isc_nmhandle_t *handle, isc_region_t *region, void *arg) {
ifp = (ns_interface_t *) arg;
mgr = ifp->clientmgr;
if (mgr == NULL) {
/* The interface was shut down in the meantime, just bail */
return;
}
REQUIRE(VALID_MANAGER(mgr));
client = isc_nmhandle_getdata(handle);