mailing list of musl libc
 help / color / mirror / code / Atom feed
From: Markus Wichmann <nullplan@gmx.net>
To: musl@lists.openwall.com
Subject: Re: [musl] IPv4 fallback in __res_msend_rc not functional
Date: Thu, 25 Aug 2022 04:58:59 +0200	[thread overview]
Message-ID: <20220825025859.GC1923@voyager> (raw)
In-Reply-To: <20220824233228.GM7074@brightrain.aerifal.cx>

On Wed, Aug 24, 2022 at 07:32:28PM -0400, Rich Felker wrote:
> Does this work?
>
> diff --git a/src/network/res_msend.c b/src/network/res_msend.c
> index 3e018009..105bf598 100644
> --- a/src/network/res_msend.c
> +++ b/src/network/res_msend.c
> @@ -68,14 +68,15 @@ int __res_msend_rc(int nqueries, const unsigned char *const *queries,
>  	}
>
>  	/* Get local address and open/bind a socket */
> -	sa.sin.sin_family = family;
>  	fd = socket(family, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
>
>  	/* Handle case where system lacks IPv6 support */
>  	if (fd < 0 && family == AF_INET6 && errno == EAFNOSUPPORT) {
>  		fd = socket(AF_INET, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
>  		family = AF_INET;
> +		sl = sizeof sa.sin;
>  	}
> +	sa.sin.sin_family = family;
>  	if (fd < 0 || bind(fd, (void *)&sa, sl) < 0) {
>  		if (fd >= 0) close(fd);
>  		pthread_setcancelstate(cs, 0);
>

That would have been my proposal as well, although I would have added a
"if (ns[j].sin.sin_family == family)" in front of the sendto call as
well.

Another question to think about is if the function should terminate
early if there are no usable servers in the config. Without the IPv4
fallback, this could only happen with conf->nns == 0, but with it, it
can also happen when all configured servers are IPv6 and IPv6 is
unusable (which the callers can't know). In that case, the function
would now not send anything (as sendto() fails silently), and wait in
vain for a response.

Ciao,
Markus

  reply	other threads:[~2022-08-25  2:59 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-24 19:03 Markus Wichmann
2022-08-24 23:26 ` Rich Felker
2022-08-24 23:32   ` Rich Felker
2022-08-25  2:58     ` Markus Wichmann [this message]
2022-08-25 13:26       ` Rich Felker
2022-08-26 16:16         ` Rich Felker
2022-08-26 16:28           ` Rich Felker
2022-08-26 17:48           ` Markus Wichmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220825025859.GC1923@voyager \
    --to=nullplan@gmx.net \
    --cc=musl@lists.openwall.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/musl/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).