mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 08:05:21 +00:00
Code Issues Releases Wiki Activity

netmgr: handle errors properly in accept_connection.

Browse Source 
If a connection was closed early (right after accept()) an assertion
that assumed that the connection was still alive could be triggered
in accept_connection. Handle those errors properly and not with
assertions, free all the resources afterwards.
This commit is contained in:
Witold Krecicki
2020-01-14 11:00:41 +01:00
parent 0d4d65e7f2
commit 6ee1461cc3
1 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
lib/isc/netmgr/tcp.c
View File

@@ -709,27 +709,36 @@ accept_connection(isc_nmsocket_t *ssock) {
r = uv_accept(&ssock->uv_handle.stream, &csock->uv_handle.stream); r = uv_accept(&ssock->uv_handle.stream, &csock->uv_handle.stream);
if (r != 0) { if (r != 0) {
if (csock->quota != NULL) { result = isc__nm_uverr2result(r);
isc_quota_detach(&csock->quota); goto error;
}
isc_mem_put(ssock->mgr->mctx, csock, sizeof(isc_nmsocket_t));
return (isc__nm_uverr2result(r));
} }
isc_nmsocket_attach(ssock, &csock->server); r = uv_tcp_getpeername(&csock->uv_handle.tcp, (struct sockaddr *) &ss,
uv_tcp_getpeername(&csock->uv_handle.tcp, (struct sockaddr *) &ss,
&(int){sizeof(ss)}); &(int){sizeof(ss)});
if (r != 0) {
result = isc__nm_uverr2result(r);
goto error;
}
result = isc_sockaddr_fromsockaddr(&csock->peer, result = isc_sockaddr_fromsockaddr(&csock->peer,
(struct sockaddr *) &ss); (struct sockaddr *) &ss);
RUNTIME_CHECK(result == ISC_R_SUCCESS); if (result != ISC_R_SUCCESS) {
uv_tcp_getsockname(&csock->uv_handle.tcp, (struct sockaddr *) &ss, goto error;
}
r = uv_tcp_getsockname(&csock->uv_handle.tcp, (struct sockaddr *) &ss,
&(int){sizeof(ss)}); &(int){sizeof(ss)});
if (r != 0) {
result = isc__nm_uverr2result(r);
goto error;
}
result = isc_sockaddr_fromsockaddr(&local, result = isc_sockaddr_fromsockaddr(&local,
(struct sockaddr *) &ss); (struct sockaddr *) &ss);
RUNTIME_CHECK(result == ISC_R_SUCCESS); if (result != ISC_R_SUCCESS) {
goto error;
}
isc_nmsocket_attach(ssock, &csock->server);
handle = isc__nmhandle_get(csock, NULL, &local); handle = isc__nmhandle_get(csock, NULL, &local);
@@ -739,6 +748,18 @@ accept_connection(isc_nmsocket_t *ssock) {
isc_nmsocket_detach(&csock); isc_nmsocket_detach(&csock);
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
error:
/*
* Detach it early to make room for other connections, otherwise
* it'd be detached later asynchronously clogging the quota.
*/
if (csock->quota != NULL) {
isc_quota_detach(&csock->quota);
}
/* We need to detach it properly to make sure uv_close is called. */
isc_nmsocket_detach(&csock);
return (result);
} }
static void static void
@@ -906,7 +927,9 @@ tcp_close_direct(isc_nmsocket_t *sock) {
uv_timer_stop(&sock->timer); uv_timer_stop(&sock->timer);
uv_close((uv_handle_t *)&sock->timer, timer_close_cb); uv_close((uv_handle_t *)&sock->timer, timer_close_cb);
} else { } else {
if (sock->server != NULL) {
isc_nmsocket_detach(&sock->server); isc_nmsocket_detach(&sock->server);
}
uv_close(&sock->uv_handle.handle, tcp_close_cb); uv_close(&sock->uv_handle.handle, tcp_close_cb);
} }
} }