diff options
Diffstat (limited to 'package/network/services/dnsmasq/patches')
3 files changed, 96 insertions, 0 deletions
diff --git a/package/network/services/dnsmasq/patches/0120-Move-fd-into-frec_src-fixes-15b60ddf935a531269bb8c68.patch b/package/network/services/dnsmasq/patches/0120-Move-fd-into-frec_src-fixes-15b60ddf935a531269bb8c68.patch new file mode 100644 index 0000000000..b2311081a9 --- /dev/null +++ b/package/network/services/dnsmasq/patches/0120-Move-fd-into-frec_src-fixes-15b60ddf935a531269bb8c68.patch @@ -0,0 +1,57 @@ +From 04490bf622ac84891aad6f2dd2edf83725decdee Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon@thekelleys.org.uk> +Date: Fri, 22 Jan 2021 16:49:12 +0000 +Subject: Move fd into frec_src, fixes 15b60ddf935a531269bb8c68198de012a4967156 + +If identical queries from IPv4 and IPv6 sources are combined by the +new code added in 15b60ddf935a531269bb8c68198de012a4967156 then replies +can end up being sent via the wrong family of socket. The ->fd +should be per query, not per-question. + +In bind-interfaces mode, this could also result in replies being sent +via the wrong socket even when IPv4/IPV6 issues are not in play. +--- + src/dnsmasq.h | 3 ++- + src/forward.c | 4 ++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +--- a/src/dnsmasq.h ++++ b/src/dnsmasq.h +@@ -653,6 +653,7 @@ struct frec { + union mysockaddr source; + union all_addr dest; + unsigned int iface, log_id; ++ int fd; + unsigned short orig_id; + struct frec_src *next; + } frec_src; +@@ -660,7 +661,7 @@ struct frec { + struct randfd *rfd4; + struct randfd *rfd6; + unsigned short new_id; +- int fd, forwardall, flags; ++ int forwardall, flags; + time_t time; + unsigned char *hash[HASH_SIZE]; + #ifdef HAVE_DNSSEC +--- a/src/forward.c ++++ b/src/forward.c +@@ -394,8 +394,8 @@ static int forward_query(int udpfd, unio + forward->frec_src.dest = *dst_addr; + forward->frec_src.iface = dst_iface; + forward->frec_src.next = NULL; ++ forward->frec_src.fd = udpfd; + forward->new_id = get_id(); +- forward->fd = udpfd; + memcpy(forward->hash, hash, HASH_SIZE); + forward->forwardall = 0; + forward->flags = fwd_flags; +@@ -1284,7 +1284,7 @@ void reply_query(int fd, int family, tim + dump_packet(DUMP_REPLY, daemon->packet, (size_t)nn, NULL, &src->source); + #endif + +- send_from(forward->fd, option_bool(OPT_NOWILD) || option_bool (OPT_CLEVERBIND), daemon->packet, nn, ++ send_from(src->fd, option_bool(OPT_NOWILD) || option_bool (OPT_CLEVERBIND), daemon->packet, nn, + &src->source, &src->dest, src->iface); + + if (option_bool(OPT_EXTRALOG) && src != &forward->frec_src) diff --git a/package/network/services/dnsmasq/patches/0121-Fix-to-75e2f0aec33e58ef5b8d4d107d821c215a52827c.patch b/package/network/services/dnsmasq/patches/0121-Fix-to-75e2f0aec33e58ef5b8d4d107d821c215a52827c.patch new file mode 100644 index 0000000000..a62439a8a1 --- /dev/null +++ b/package/network/services/dnsmasq/patches/0121-Fix-to-75e2f0aec33e58ef5b8d4d107d821c215a52827c.patch @@ -0,0 +1,19 @@ +From 12af2b171de0d678d98583e2190789e544440e02 Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon@thekelleys.org.uk> +Date: Fri, 22 Jan 2021 18:24:03 +0000 +Subject: Fix to 75e2f0aec33e58ef5b8d4d107d821c215a52827c + +--- + src/forward.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/src/forward.c ++++ b/src/forward.c +@@ -370,6 +370,7 @@ static int forward_query(int udpfd, unio + new->dest = *dst_addr; + new->log_id = daemon->log_id; + new->iface = dst_iface; ++ forward->frec_src.fd = udpfd; + } + + return 1; diff --git a/package/network/services/dnsmasq/patches/0123-Fix-for-12af2b171de0d678d98583e2190789e544440e02.patch b/package/network/services/dnsmasq/patches/0123-Fix-for-12af2b171de0d678d98583e2190789e544440e02.patch new file mode 100644 index 0000000000..1769f77a52 --- /dev/null +++ b/package/network/services/dnsmasq/patches/0123-Fix-for-12af2b171de0d678d98583e2190789e544440e02.patch @@ -0,0 +1,20 @@ +From 3f535da79e7a42104543ef5c7b5fa2bed819a78b Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon@thekelleys.org.uk> +Date: Fri, 22 Jan 2021 22:26:25 +0000 +Subject: Fix for 12af2b171de0d678d98583e2190789e544440e02 + +--- + src/forward.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/forward.c ++++ b/src/forward.c +@@ -370,7 +370,7 @@ static int forward_query(int udpfd, unio + new->dest = *dst_addr; + new->log_id = daemon->log_id; + new->iface = dst_iface; +- forward->frec_src.fd = udpfd; ++ new->fd = udpfd; + } + + return 1; |