From: Alexey Kodanev <aleksei.kodanev@bell-sw.com>
Date: Wed, 22 Mar 2023 14:48:40 +0000 (+0300)
Subject: dns: check length field in tcp response message
X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=commitdiff_plain;h=77327ed064bd57b0e1865cd0e0364057ff4a53b4;ds=sidebyside

dns: check length field in tcp response message

The received length field in the message may be greater than the
size of the 'answer' buffer in which the message resides. Currently,
ABUF_SIZE is 768. And if we get a larger 'alens[i]', it will result
in an out-of-bounds reading in __dns_parse().

To fix this, limit the length to the size of the received buffer.
---

diff --git a/src/network/lookup_name.c b/src/network/lookup_name.c
index f268bcda..4281482e 100644
--- a/src/network/lookup_name.c
+++ b/src/network/lookup_name.c
@@ -179,6 +179,7 @@ static int name_from_dns(struct address buf[static MAXADDRS], char canon[static
 
 	for (i=nq-1; i>=0; i--) {
 		ctx.rrtype = qtypes[i];
+		if (alens[i] > sizeof(abuf[i])) alens[i] = sizeof abuf[i];
 		__dns_parse(abuf[i], alens[i], dns_parse_callback, &ctx);
 	}