From 213cfb34358d86a65deecdb9f5b11a20ad0895d1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Feb 2024 19:02:23 +0100 Subject: [PATCH] package/dnsmasq: security bump version to 2.90 Changelog: https://thekelleys.org.uk/dnsmasq/CHANGELOG Release notes: https://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2024q1/017430.html Fixes CVE 2023-50387 and CVE 2023-50868. Removed patch which is included in this release. Switched _SITE to https. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- ...default-maximum-dns-udp-package-size.patch | 64 ------------------- package/dnsmasq/dnsmasq.hash | 4 +- package/dnsmasq/dnsmasq.mk | 4 +- 3 files changed, 4 insertions(+), 68 deletions(-) delete mode 100644 package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch diff --git a/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch b/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch deleted file mode 100644 index 4dd17ec069..0000000000 --- a/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch +++ /dev/null @@ -1,64 +0,0 @@ -From eb92fb32b746f2104b0f370b5b295bb8dd4bd5e5 Mon Sep 17 00:00:00 2001 -From: Simon Kelley -Date: Tue, 7 Mar 2023 22:07:46 +0000 -Subject: [PATCH] Set the default maximum DNS UDP packet size to 1232. -Upstream: https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=eb92fb32b746f2104b0f370b5b295bb8dd4bd5e5 - -http://www.dnsflagday.net/2020/ refers. - -Thanks to Xiang Li for the prompt. - -[dalang@gmx.at: backport from upstream] -Signed-off-by: Daniel Lang ---- - CHANGELOG | 9 ++++++++ - man/dnsmasq.8 | 3 ++- - src/config.h | 2 +- - 3 files changed, 12 insertions(+), 2 deletions(-) - -diff --git a/CHANGELOG b/CHANGELOG -index 3af20cf..52d8678 100644 ---- a/CHANGELOG -+++ b/CHANGELOG -@@ -1,3 +1,12 @@ version 2.90 -+version 2.90 -+ Set the default maximum DNS UDP packet sice to 1232. This -+ has been the recommended value since 2020 because it's the -+ largest value that avoid fragmentation, and fragmentation -+ is just not reliable on the modern internet, especially -+ for IPv6. It's still possible to override this with -+ --edns-packet-max for special circumstances. -+ -+ - version 2.89 - Fix bug introduced in 2.88 (commit fe91134b) which can result - in corruption of the DNS cache internal data structures and -diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 -index 41e2e04..5acb935 100644 ---- a/man/dnsmasq.8 -+++ b/man/dnsmasq.8 -@@ -183,7 +183,8 @@ to zero completely disables DNS function, leaving only DHCP and/or TFTP. - .TP - .B \-P, --edns-packet-max= - Specify the largest EDNS.0 UDP packet which is supported by the DNS --forwarder. Defaults to 4096, which is the RFC5625-recommended size. -+forwarder. Defaults to 1232, which is the recommended size following the -+DNS flag day in 2020. Only increase if you know what you are doing. - .TP - .B \-Q, --query-port= - Send outbound DNS queries from, and listen for their replies on, the -diff --git a/src/config.h b/src/config.h -index 1e7b30f..37b374e 100644 ---- a/src/config.h -+++ b/src/config.h -@@ -19,7 +19,7 @@ - #define CHILD_LIFETIME 150 /* secs 'till terminated (RFC1035 suggests > 120s) */ - #define TCP_MAX_QUERIES 100 /* Maximum number of queries per incoming TCP connection */ - #define TCP_BACKLOG 32 /* kernel backlog limit for TCP connections */ --#define EDNS_PKTSZ 4096 /* default max EDNS.0 UDP packet from RFC5625 */ -+#define EDNS_PKTSZ 1232 /* default max EDNS.0 UDP packet from from /dnsflagday.net/2020 */ - #define SAFE_PKTSZ 1232 /* "go anywhere" UDP packet size, see https://dnsflagday.net/2020/ */ - #define KEYBLOCK_LEN 40 /* choose to minimise fragmentation when storing DNSSEC keys */ - #define DNSSEC_WORK 50 /* Max number of queries to validate one question */ --- -2.20.1 diff --git a/package/dnsmasq/dnsmasq.hash b/package/dnsmasq/dnsmasq.hash index 02ffb2656b..d11e8af590 100644 --- a/package/dnsmasq/dnsmasq.hash +++ b/package/dnsmasq/dnsmasq.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.89.tar.xz.asc -sha256 02bd230346cf0b9d5909f5e151df168b2707103785eb616b56685855adebb609 dnsmasq-2.89.tar.xz +# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.90.tar.xz.asc +sha256 8e50309bd837bfec9649a812e066c09b6988b73d749b7d293c06c57d46a109e4 dnsmasq-2.90.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3 diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 9c05857f22..9f342cb049 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -4,9 +4,9 @@ # ################################################################################ -DNSMASQ_VERSION = 2.89 +DNSMASQ_VERSION = 2.90 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz -DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq +DNSMASQ_SITE = https://thekelleys.org.uk/dnsmasq DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" DNSMASQ_MAKE_OPTS = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)" DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)" \