diff options
author | Peter Marko <peter.marko@siemens.com> | 2024-02-24 14:03:25 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2024-02-26 08:13:22 -0800 |
commit | 4c70fb8051feca929e243a69c0e89b695794ef08 (patch) | |
tree | 41cfd9465e3b2411898c36edd756243ee3059389 /meta-networking/recipes-support/dnsmasq/files | |
parent | 7e420c584ffae8f6430094106d6003954c955435 (diff) | |
download | meta-openembedded-4c70fb8051feca929e243a69c0e89b695794ef08.tar.gz |
dnsmasq: Upgrade 2.89 -> 2.90
Fixes CVE-2023-50387 and CVE-2023-50868
Remove backported CVE patch.
Remove patch for lua as hardcoding lua version was removed.
Signed-off-by: Peter Marko <peter.marko@siemens.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-support/dnsmasq/files')
-rw-r--r-- | meta-networking/recipes-support/dnsmasq/files/CVE-2023-28450.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/meta-networking/recipes-support/dnsmasq/files/CVE-2023-28450.patch b/meta-networking/recipes-support/dnsmasq/files/CVE-2023-28450.patch deleted file mode 100644 index 129c9043e8..0000000000 --- a/meta-networking/recipes-support/dnsmasq/files/CVE-2023-28450.patch +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | From eb92fb32b746f2104b0f370b5b295bb8dd4bd5e5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Simon Kelley <simon@thekelleys.org.uk> | ||
3 | Date: Tue, 7 Mar 2023 22:07:46 +0000 | ||
4 | Subject: [PATCH] Set the default maximum DNS UDP packet size to 1232. | ||
5 | |||
6 | http://www.dnsflagday.net/2020/ refers. | ||
7 | |||
8 | Thanks to Xiang Li for the prompt. | ||
9 | |||
10 | CVE: CVE-2023-28450 | ||
11 | Upstream-Status: Backport [https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=eb92fb32b746f2104b0f370b5b295bb8dd4bd5e5] | ||
12 | |||
13 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
14 | --- | ||
15 | man/dnsmasq.8 | 3 ++- | ||
16 | src/config.h | 2 +- | ||
17 | 2 files changed, 3 insertions(+), 2 deletions(-) | ||
18 | |||
19 | diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 | ||
20 | index 41e2e04..5acb935 100644 | ||
21 | --- a/man/dnsmasq.8 | ||
22 | +++ b/man/dnsmasq.8 | ||
23 | @@ -183,7 +183,8 @@ to zero completely disables DNS function, leaving only DHCP and/or TFTP. | ||
24 | .TP | ||
25 | .B \-P, --edns-packet-max=<size> | ||
26 | Specify the largest EDNS.0 UDP packet which is supported by the DNS | ||
27 | -forwarder. Defaults to 4096, which is the RFC5625-recommended size. | ||
28 | +forwarder. Defaults to 1232, which is the recommended size following the | ||
29 | +DNS flag day in 2020. Only increase if you know what you are doing. | ||
30 | .TP | ||
31 | .B \-Q, --query-port=<query_port> | ||
32 | Send outbound DNS queries from, and listen for their replies on, the | ||
33 | diff --git a/src/config.h b/src/config.h | ||
34 | index 1e7b30f..37b374e 100644 | ||
35 | --- a/src/config.h | ||
36 | +++ b/src/config.h | ||
37 | @@ -19,7 +19,7 @@ | ||
38 | #define CHILD_LIFETIME 150 /* secs 'till terminated (RFC1035 suggests > 120s) */ | ||
39 | #define TCP_MAX_QUERIES 100 /* Maximum number of queries per incoming TCP connection */ | ||
40 | #define TCP_BACKLOG 32 /* kernel backlog limit for TCP connections */ | ||
41 | -#define EDNS_PKTSZ 4096 /* default max EDNS.0 UDP packet from RFC5625 */ | ||
42 | +#define EDNS_PKTSZ 1232 /* default max EDNS.0 UDP packet from from /dnsflagday.net/2020 */ | ||
43 | #define SAFE_PKTSZ 1232 /* "go anywhere" UDP packet size, see https://dnsflagday.net/2020/ */ | ||
44 | #define KEYBLOCK_LEN 40 /* choose to minimise fragmentation when storing DNSSEC keys */ | ||
45 | #define DNSSEC_WORK 50 /* Max number of queries to validate one question */ | ||
46 | -- | ||
47 | 2.20.1 | ||
48 | |||