diff options
Diffstat (limited to 'meta/recipes-core/busybox/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch')
-rw-r--r-- | meta/recipes-core/busybox/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/meta/recipes-core/busybox/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch b/meta/recipes-core/busybox/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch new file mode 100644 index 0000000000..2c9da33a51 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch | |||
@@ -0,0 +1,64 @@ | |||
1 | From f8ad7c331b25ba90fd296b37c443b4114cb196e2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ariadne Conill <ariadne@dereferenced.org> | ||
3 | Date: Sun, 3 Apr 2022 12:16:45 +0000 | ||
4 | Subject: [PATCH] nslookup: sanitize all printed strings with printable_string | ||
5 | |||
6 | Otherwise, terminal sequences can be injected, which enables various terminal injection | ||
7 | attacks from DNS results. | ||
8 | |||
9 | MJ: One chunk wasn't applicable on 1.31.1 version, because parsing of | ||
10 | SRV records was added only in newer 1.32.0 with: | ||
11 | commit 6b4960155e94076bf25518e4e268a7a5f849308e | ||
12 | Author: Jo-Philipp Wich <jo@mein.io> | ||
13 | Date: Thu Jun 27 17:27:29 2019 +0200 | ||
14 | |||
15 | nslookup: implement support for SRV records | ||
16 | |||
17 | CVE: CVE-2022-28391 | ||
18 | Upstream-Status: Pending | ||
19 | Signed-off-by: Ariadne Conill <ariadne@dereferenced.org> | ||
20 | Signed-off-by: Steve Sakoman <steve@sakoman.com> | ||
21 | --- | ||
22 | networking/nslookup.c | 8 ++++---- | ||
23 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
24 | |||
25 | diff --git a/networking/nslookup.c b/networking/nslookup.c | ||
26 | index 24e09d4f0..89b9c8a13 100644 | ||
27 | --- a/networking/nslookup.c | ||
28 | +++ b/networking/nslookup.c | ||
29 | @@ -404,7 +404,7 @@ static int parse_reply(const unsigned char *msg, size_t len) | ||
30 | //printf("Unable to uncompress domain: %s\n", strerror(errno)); | ||
31 | return -1; | ||
32 | } | ||
33 | - printf(format, ns_rr_name(rr), dname); | ||
34 | + printf(format, ns_rr_name(rr), printable_string(dname)); | ||
35 | break; | ||
36 | |||
37 | case ns_t_mx: | ||
38 | @@ -419,7 +419,7 @@ static int parse_reply(const unsigned char *msg, size_t len) | ||
39 | //printf("Cannot uncompress MX domain: %s\n", strerror(errno)); | ||
40 | return -1; | ||
41 | } | ||
42 | - printf("%s\tmail exchanger = %d %s\n", ns_rr_name(rr), n, dname); | ||
43 | + printf("%s\tmail exchanger = %d %s\n", ns_rr_name(rr), n, printable_string(dname)); | ||
44 | break; | ||
45 | |||
46 | case ns_t_txt: | ||
47 | @@ -431,7 +431,7 @@ static int parse_reply(const unsigned char *msg, size_t len) | ||
48 | if (n > 0) { | ||
49 | memset(dname, 0, sizeof(dname)); | ||
50 | memcpy(dname, ns_rr_rdata(rr) + 1, n); | ||
51 | - printf("%s\ttext = \"%s\"\n", ns_rr_name(rr), dname); | ||
52 | + printf("%s\ttext = \"%s\"\n", ns_rr_name(rr), printable_string(dname)); | ||
53 | } | ||
54 | break; | ||
55 | |||
56 | @@ -461,7 +461,7 @@ static int parse_reply(const unsigned char *msg, size_t len) | ||
57 | return -1; | ||
58 | } | ||
59 | |||
60 | - printf("\tmail addr = %s\n", dname); | ||
61 | + printf("\tmail addr = %s\n", printable_string(dname)); | ||
62 | cp += n; | ||
63 | |||
64 | printf("\tserial = %lu\n", ns_get32(cp)); | ||