upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-02-27 12:02:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't free udp recv buffer if UV_UDP_MMSG_CHUNK is set

Browse source
This commit is contained in:
Witold Kręcicki 2020-04-29 15:19:32 +02:00
parent d5356a40ff
commit 83049ceabf
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/isc/netmgr/netmgr.c
View file

@ -996,7 +996,7 @@ isc__nm_free_uvbuf(isc_nmsocket_t *sock, const uv_buf_t *buf) {
if (buf->base > worker->recvbuf &&
buf->base <= worker->recvbuf + ISC_NETMGR_RECVBUF_SIZE)
{
/* Can happen in case of recvmmsg */
/* Can happen in case of out-of-order recvmmsg in libuv1.36 */
return;
}
REQUIRE(buf->base == worker->recvbuf);

18
lib/isc/netmgr/udp.c
View file

@ -295,22 +295,24 @@ udp_recv_cb(uv_udp_t *handle, ssize_t nrecv, const uv_buf_t *buf,
isc_nmsocket_t *sock = uv_handle_get_data((uv_handle_t *)handle);
isc_region_t region;
uint32_t maxudp;
bool free_buf = true;
REQUIRE(VALID_NMSOCK(sock));
/*
* We can ignore the flags; currently the only one in use by libuv
* is UV_UDP_PARTIAL, which only occurs if the receive buffer is
* too small, which can't happen here.
*/
#ifdef UV_UDP_MMSG_CHUNK
free_buf = ((flags & UV_UDP_MMSG_CHUNK) == 0);
#else
UNUSED(flags);
#endif
/*
* If addr == NULL that's the end of stream - we can
* free the buffer and bail.
*/
if (addr == NULL) {
isc__nm_free_uvbuf(sock, buf);
if (free_buf) {
isc__nm_free_uvbuf(sock, buf);
}
return;
}
@ -331,7 +333,9 @@ udp_recv_cb(uv_udp_t *handle, ssize_t nrecv, const uv_buf_t *buf,
INSIST(sock->rcb.recv != NULL);
sock->rcb.recv(nmhandle, &region, sock->rcbarg);
isc__nm_free_uvbuf(sock, buf);
if (free_buf) {
isc__nm_free_uvbuf(sock, buf);
}
/*
* If the recv callback wants to hold on to the handle,