diff --git a/backport-CVE-2023-32067.patch b/backport-CVE-2023-32067.patch new file mode 100644 index 0000000000000000000000000000000000000000..bf969911183a34dcea3fffcb58ff2d8ce830f691 --- /dev/null +++ b/backport-CVE-2023-32067.patch @@ -0,0 +1,84 @@ +From b9b8413cfdb70a3f99e1573333b23052d57ec1ae Mon Sep 17 00:00:00 2001 +From: Brad House +Date: Mon, 22 May 2023 06:51:49 -0400 +Subject: [PATCH] Merge pull request from GHSA-9g78-jv2r-p7vc + +Conflict: src/lib/ares_process.c -> ares_process.c +Reference: https://github.com/c-ares/c-ares/commit/b9b8413cfdb70a3f99e1573333b23052d57ec1ae +--- + ares_process.c | 41 +++++++++++++++++++++++++---------------- + 1 file changed, 25 insertions(+), 16 deletions(-) + +diff --git a/ares_process.c b/ares_process.c +index bf0cde4..6cac0a9 100644 +--- a/ares_process.c ++++ b/ares_process.c +@@ -470,7 +470,7 @@ static void read_udp_packets(ares_channel channel, fd_set *read_fds, + { + struct server_state *server; + int i; +- ares_ssize_t count; ++ ares_ssize_t read_len; + unsigned char buf[MAXENDSSZ + 1]; + #ifdef HAVE_RECVFROM + ares_socklen_t fromlen; +@@ -513,32 +513,41 @@ static void read_udp_packets(ares_channel channel, fd_set *read_fds, + /* To reduce event loop overhead, read and process as many + * packets as we can. */ + do { +- if (server->udp_socket == ARES_SOCKET_BAD) +- count = 0; +- +- else { +- if (server->addr.family == AF_INET) ++ if (server->udp_socket == ARES_SOCKET_BAD) { ++ read_len = -1; ++ } else { ++ if (server->addr.family == AF_INET) { + fromlen = sizeof(from.sa4); +- else ++ } else { + fromlen = sizeof(from.sa6); +- count = socket_recvfrom(channel, server->udp_socket, (void *)buf, +- sizeof(buf), 0, &from.sa, &fromlen); ++ } ++ read_len = socket_recvfrom(channel, server->udp_socket, (void *)buf, ++ sizeof(buf), 0, &from.sa, &fromlen); + } + +- if (count == -1 && try_again(SOCKERRNO)) ++ if (read_len == 0) { ++ /* UDP is connectionless, so result code of 0 is a 0-length UDP ++ * packet, and not an indication the connection is closed like on ++ * tcp */ + continue; +- else if (count <= 0) ++ } else if (read_len < 0) { ++ if (try_again(SOCKERRNO)) ++ continue; ++ + handle_error(channel, i, now); ++ + #ifdef HAVE_RECVFROM +- else if (!same_address(&from.sa, &server->addr)) ++ } else if (!same_address(&from.sa, &server->addr)) { + /* The address the response comes from does not match the address we + * sent the request to. Someone may be attempting to perform a cache + * poisoning attack. */ +- break; ++ continue; + #endif +- else +- process_answer(channel, buf, (int)count, i, 0, now); +- } while (count > 0); ++ ++ } else { ++ process_answer(channel, buf, (int)read_len, i, 0, now); ++ } ++ } while (read_len >= 0); + } + } + +-- +2.27.0 + diff --git a/c-ares.spec b/c-ares.spec index ea0f9cda93b5a04065c25aafce72e6f5faab9cd1..72459fa7bd5ea894ad293f8df92ced3269458ef7 100644 --- a/c-ares.spec +++ b/c-ares.spec @@ -1,6 +1,6 @@ Name: c-ares Version: 1.16.1 -Release: 5 +Release: 6 Summary: A C library for asynchronous DNS requests License: MIT @@ -18,6 +18,7 @@ Patch5: backport-001-CVE-2021-3672.patch Patch6: backport-002-CVE-2021-3672.patch Patch7: backport-add-str-len-check-in-config_sortlist-to-avoid-stack-overflow.patch Patch8: backport-disable-live-tests.patch +Patch9: backport-CVE-2023-32067.patch %description This is c-ares, an asynchronous resolver library. It is intended for applications @@ -65,6 +66,12 @@ make %{?_smp_mflags} %{_mandir}/man3/* %changelog +* Mon May 29 2023 xinghe - 1.16.1-6 +- Type:cves +- CVE:CVE-2023-32067 +- SUG:NA +- DESC:fix CVE-2023-32067 + * Wed Mar 08 2023 xinghe - 1.16.1-5 - Type:bugfix - CVE:NA