From fcb5642ec012e17ceb88fe9e056492fc70bcaf6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Witold=20Kr=C4=99cicki?= Date: Sun, 17 Feb 2019 20:32:07 +0100 Subject: [PATCH 1/2] Clean up client->ecs when we're done with the request. (cherry picked from commit aa3da7a232c0f9bdffa701fe21d6169beb766f60) --- lib/ns/client.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/ns/client.c b/lib/ns/client.c index 321818bd27..4a43fb6d32 100644 --- a/lib/ns/client.c +++ b/lib/ns/client.c @@ -765,6 +765,7 @@ ns_client_endrequest(ns_client_t *client) { client->udpsize = 512; client->extflags = 0; client->ednsversion = -1; + dns_ecs_init(&client->ecs); dns_message_reset(client->message, DNS_MESSAGE_INTENTPARSE); if (client->recursionquota != NULL) { From a87585aba33620513d2d5c049e7aabd2a6edb4c0 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Tue, 12 Mar 2019 13:38:06 -0700 Subject: [PATCH 2/2] CHANGES (cherry picked from commit 9463a781fb687b4b7357ea1e243fdcb7ac6739aa) --- CHANGES | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES b/CHANGES index a56059ca87..30baddeefe 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +5183. [bug] Reinitialize ECS data before reusing client + structures. [GL #881] + 5182. [bug] Fix a high-load race/crash in handling of isc_socket_close() in resolver. [GL #834]