mirrors/musl
0
0
Fork 0
mirror of git://git.musl-libc.org/musl synced 2024-11-23 10:03:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

dns query core: detect udp truncation at recv time

Browse Source 
we already attempt to preclude this case by having res_send use a
sufficiently large temporary buffer even if the caller did not provide
one as large as or larger than the udp dns max of 512 bytes. however,
it's possible that the caller passed a custom-crafted query packet
using EDNS0, e.g. to get detailed DNSSEC results, with a larger udp
size allowance.

I have also seen claims that there are some broken nameservers in the
wild that do not honor the dns udp limit of 512 and send large answers
without the TC bit set, when the query was not using EDNS.

we generally don't aim to support broken nameservers, but in this case
both problems, if the latter is even real, have a common solution:
using recvmsg instead of recvfrom so we can examine the MSG_TRUNC
flag.
This commit is contained in:
Rich Felker 2022-09-25 22:48:12 -04:00
parent 8c408937da
commit dec8f0a4fa
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/network/res_msend.c
View File

@ -194,9 +194,18 @@ int __res_msend_rc(int nqueries, const unsigned char *const *queries,
/* Wait for a response, or until time to retry */
if (poll(pfd, nqueries+1, t1+retry_interval-t2) <= 0) continue;
while (next < nqueries &&
(rlen = recvfrom(fd, answers[next], asize, 0,
(void *)&sa, (socklen_t[1]){sl})) >= 0) {
while (next < nqueries) {
struct msghdr mh = {
.msg_name = (void *)&sa,
.msg_namelen = sl,
.msg_iovlen = 1,
.msg_iov = (struct iovec []){
{ .iov_base = (void *)answers[next],
.iov_len = asize }
}
};
rlen = recvmsg(fd, &mh, 0);
if (rlen < 0) break;
/* Ignore non-identifiable packets */
if (rlen < 4) continue;
@ -240,7 +249,7 @@ int __res_msend_rc(int nqueries, const unsigned char *const *queries,
if (next == nqueries) pfd[nqueries].events = 0;
/* If answer is truncated (TC bit), fallback to TCP */
if (answers[i][2] & 2) {
if ((answers[i][2] & 2) || (mh.msg_flags & MSG_TRUNC)) {
alens[i] = -1;
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, 0);
r = start_tcp(pfd+i, family, ns+j, sl, queries[i], qlens[i]);