1*4882a593SmuzhiyunFrom bd463a5564a2c0618317448c3f965d389534c3df Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Ariadne Conill <ariadne@dereferenced.org> 3*4882a593SmuzhiyunDate: Mon, 19 Sep 2022 14:15:12 +0200 4*4882a593SmuzhiyunSubject: [PATCH] nslookup: sanitize all printed strings with printable_string 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunOtherwise, terminal sequences can be injected, which enables various terminal injection 7*4882a593Smuzhiyunattacks from DNS results. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunCVE: CVE-2022-28391 10*4882a593SmuzhiyunSigned-off-by: Ariadne Conill <ariadne@dereferenced.org> 11*4882a593SmuzhiyunTested-by: Radoslav Kolev <radoslav.kolev@suse.com> 12*4882a593SmuzhiyunBackport from ML: http://lists.busybox.net/pipermail/busybox/2022-July/089795.html 13*4882a593SmuzhiyunSigned-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> 14*4882a593Smuzhiyun--- 15*4882a593Smuzhiyun networking/nslookup.c | 10 +++++----- 16*4882a593Smuzhiyun 1 file changed, 5 insertions(+), 5 deletions(-) 17*4882a593Smuzhiyun 18*4882a593Smuzhiyundiff --git a/networking/nslookup.c b/networking/nslookup.c 19*4882a593Smuzhiyunindex 6da97baf4..4bdcde1b8 100644 20*4882a593Smuzhiyun--- a/networking/nslookup.c 21*4882a593Smuzhiyun+++ b/networking/nslookup.c 22*4882a593Smuzhiyun@@ -407,7 +407,7 @@ static NOINLINE int parse_reply(const unsigned char *msg, size_t len) 23*4882a593Smuzhiyun //printf("Unable to uncompress domain: %s\n", strerror(errno)); 24*4882a593Smuzhiyun return -1; 25*4882a593Smuzhiyun } 26*4882a593Smuzhiyun- printf(format, ns_rr_name(rr), dname); 27*4882a593Smuzhiyun+ printf(format, ns_rr_name(rr), printable_string(dname)); 28*4882a593Smuzhiyun break; 29*4882a593Smuzhiyun 30*4882a593Smuzhiyun case ns_t_mx: 31*4882a593Smuzhiyun@@ -422,7 +422,7 @@ static NOINLINE int parse_reply(const unsigned char *msg, size_t len) 32*4882a593Smuzhiyun //printf("Cannot uncompress MX domain: %s\n", strerror(errno)); 33*4882a593Smuzhiyun return -1; 34*4882a593Smuzhiyun } 35*4882a593Smuzhiyun- printf("%s\tmail exchanger = %d %s\n", ns_rr_name(rr), n, dname); 36*4882a593Smuzhiyun+ printf("%s\tmail exchanger = %d %s\n", ns_rr_name(rr), n, printable_string(dname)); 37*4882a593Smuzhiyun break; 38*4882a593Smuzhiyun 39*4882a593Smuzhiyun case ns_t_txt: 40*4882a593Smuzhiyun@@ -434,7 +434,7 @@ static NOINLINE int parse_reply(const unsigned char *msg, size_t len) 41*4882a593Smuzhiyun if (n > 0) { 42*4882a593Smuzhiyun memset(dname, 0, sizeof(dname)); 43*4882a593Smuzhiyun memcpy(dname, ns_rr_rdata(rr) + 1, n); 44*4882a593Smuzhiyun- printf("%s\ttext = \"%s\"\n", ns_rr_name(rr), dname); 45*4882a593Smuzhiyun+ printf("%s\ttext = \"%s\"\n", ns_rr_name(rr), printable_string(dname)); 46*4882a593Smuzhiyun } 47*4882a593Smuzhiyun break; 48*4882a593Smuzhiyun 49*4882a593Smuzhiyun@@ -454,7 +454,7 @@ static NOINLINE int parse_reply(const unsigned char *msg, size_t len) 50*4882a593Smuzhiyun } 51*4882a593Smuzhiyun 52*4882a593Smuzhiyun printf("%s\tservice = %u %u %u %s\n", ns_rr_name(rr), 53*4882a593Smuzhiyun- ns_get16(cp), ns_get16(cp + 2), ns_get16(cp + 4), dname); 54*4882a593Smuzhiyun+ ns_get16(cp), ns_get16(cp + 2), ns_get16(cp + 4), printable_string(dname)); 55*4882a593Smuzhiyun break; 56*4882a593Smuzhiyun 57*4882a593Smuzhiyun case ns_t_soa: 58*4882a593Smuzhiyun@@ -483,7 +483,7 @@ static NOINLINE int parse_reply(const unsigned char *msg, size_t len) 59*4882a593Smuzhiyun return -1; 60*4882a593Smuzhiyun } 61*4882a593Smuzhiyun 62*4882a593Smuzhiyun- printf("\tmail addr = %s\n", dname); 63*4882a593Smuzhiyun+ printf("\tmail addr = %s\n", printable_string(dname)); 64*4882a593Smuzhiyun cp += n; 65*4882a593Smuzhiyun 66*4882a593Smuzhiyun printf("\tserial = %lu\n", ns_get32(cp)); 67*4882a593Smuzhiyun-- 68*4882a593Smuzhiyun2.37.3 69*4882a593Smuzhiyun 70