From: DJ Delorie <dj@redhat.com>
To: Siddhesh Poyarekar <siddhesh@sourceware.org>
Cc: libc-alpha@sourceware.org
Subject: Re: [PATCH v2 02/12] gaih_inet: Simplify canon name resolution
Date: Wed, 16 Mar 2022 17:12:41 -0400 [thread overview]
Message-ID: <xnk0ctioty.fsf@greed.delorie.com> (raw)
In-Reply-To: <20220314094835.1159523-3-siddhesh@sourceware.org> (message from Siddhesh Poyarekar via Libc-alpha on Mon, 14 Mar 2022 15:18:25 +0530)
Siddhesh Poyarekar via Libc-alpha <libc-alpha@sourceware.org> writes:
> Simplify logic for allocation of canon to remove the canonbuf variable;
> canon now always points to an allocated block. Also pull the canon name
> set into a separate function.
LGTM.
Reviewed-by: DJ Delorie <dj@redhat.com>
> diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
> - canonbuf = __strdup (localcanon); \
> + char *canonbuf = __strdup (localcanon); \
Ok.
> @@ -323,6 +323,41 @@ getcanonname (nss_action_list nip, struct gaih_addrtuple *at, const char *name)
> +/* Process looked up canonical name and if necessary, decode to IDNA. Result
> + is a new string written to CANONP and the earlier string is freed. */
> +
> +static int
> +process_canonname (const struct addrinfo *req, const char *orig_name,
> + char **canonp)
> +{
> + char *canon = *canonp;
> +
> + if ((req->ai_flags & AI_CANONNAME) != 0)
> + {
> + bool do_idn = req->ai_flags & AI_CANONIDN;
> + if (do_idn)
> + {
> + char *out;
> + int rc = __idna_from_dns_encoding (canon ?: orig_name, &out);
> + if (rc == 0)
> + {
> + free (canon);
> + canon = out;
> + }
> + else if (rc == EAI_IDN_ENCODE)
> + /* Use the punycode name as a fallback. */
> + do_idn = false;
> + else
> + return -rc;
> + }
> + if (!do_idn && canon == NULL && (canon = __strdup (orig_name)) == NULL)
> + return -EAI_MEMORY;
> + }
> +
> + *canonp = canon;
> + return 0;
> +}
Moved from below, ok.
> @@ -332,7 +367,7 @@ gaih_inet (const char *name, const struct gaih_service *service,
> struct gaih_servtuple *st = (struct gaih_servtuple *) &nullserv;
> struct gaih_addrtuple *at = NULL;
> bool got_ipv6 = false;
> - const char *canon = NULL;
> + char *canon = NULL;
Ok.
> - char *canonbuf = NULL;
Ok.
> @@ -495,7 +529,15 @@ gaih_inet (const char *name, const struct gaih_service *service,
> }
>
> if (req->ai_flags & AI_CANONNAME)
> - canon = name;
> + {
> + char *canonbuf = __strdup (name);
> + if (canonbuf == NULL)
> + {
> + result = -EAI_MEMORY;
> + goto free_and_return;
> + }
> + canon = canonbuf;
> + }
Ok.
> @@ -545,7 +587,15 @@ gaih_inet (const char *name, const struct gaih_service *service,
> }
>
> if (req->ai_flags & AI_CANONNAME)
> - canon = name;
> + {
> + char *canonbuf = __strdup (name);
> + if (canonbuf == NULL)
> + {
> + result = -EAI_MEMORY;
> + goto free_and_return;
> + }
> + canon = canonbuf;
> + }
Ok.
> @@ -676,9 +726,9 @@ gaih_inet (const char *name, const struct gaih_service *service,
> (*pat)->next = NULL;
> if (added_canon || air->canon == NULL)
> (*pat)->name = NULL;
> - else if (canonbuf == NULL)
> + else if (canon == NULL)
> {
> - canonbuf = __strdup (air->canon);
> + char *canonbuf = __strdup (air->canon);
Ok.
> @@ -748,9 +798,9 @@ gaih_inet (const char *name, const struct gaih_service *service,
> /* Always start afresh; continue should discard previous results
> and the hosts database does not support merge. */
> at = NULL;
> - free (canonbuf);
> + free (canon);
> free (addrmem);
> - canon = canonbuf = NULL;
> + canon = NULL;
> addrmem = NULL;
Ok.
> @@ -804,7 +854,16 @@ gaih_inet (const char *name, const struct gaih_service *service,
> no_data = 1;
>
> if ((req->ai_flags & AI_CANONNAME) != 0 && canon == NULL)
> - canon = at->name;
> + {
> + char *canonbuf = __strdup (at->name);
> + if (canonbuf == NULL)
> + {
> + __resolv_context_put (res_ctx);
> + result = -EAI_MEMORY;
> + goto free_and_return;
> + }
> + canon = canonbuf;
> + }
Ok.
> @@ -892,7 +951,7 @@ gaih_inet (const char *name, const struct gaih_service *service,
> if ((req->ai_flags & AI_CANONNAME) != 0
> && canon == NULL)
> {
> - canonbuf = getcanonname (nip, at, name);
> + char *canonbuf = getcanonname (nip, at, name);
Ok.
> @@ -1003,6 +1062,10 @@ gaih_inet (const char *name, const struct gaih_service *service,
> }
>
> {
> + /* Set up the canonical name if we need it. */
> + if ((result = process_canonname (req, orig_name, &canon)) != 0)
> + goto free_and_return;
> +
Ok.
> @@ -1013,48 +1076,6 @@ gaih_inet (const char *name, const struct gaih_service *service,
> */
> while (at2 != NULL)
> {
> - /* Only the first entry gets the canonical name. */
> - if (at2 == at && (req->ai_flags & AI_CANONNAME) != 0)
> - {
> - if (canon == NULL)
> - /* If the canonical name cannot be determined, use
> - the passed in string. */
> - canon = orig_name;
> -
> - bool do_idn = req->ai_flags & AI_CANONIDN;
> - if (do_idn)
> - {
> - char *out;
> - int rc = __idna_from_dns_encoding (canon, &out);
> - if (rc == 0)
> - canon = out;
> - else if (rc == EAI_IDN_ENCODE)
> - /* Use the punycode name as a fallback. */
> - do_idn = false;
> - else
> - {
> - result = -rc;
> - goto free_and_return;
> - }
> - }
> - if (!do_idn)
> - {
> - if (canonbuf != NULL)
> - /* We already allocated the string using malloc, but
> - the buffer is now owned by canon. */
> - canonbuf = NULL;
> - else
> - {
> - canon = __strdup (canon);
> - if (canon == NULL)
> - {
> - result = -EAI_MEMORY;
> - goto free_and_return;
> - }
> - }
> - }
> - }
> -
Moved above; ok.
> @@ -1077,7 +1098,6 @@ gaih_inet (const char *name, const struct gaih_service *service,
> ai = *pai = malloc (sizeof (struct addrinfo) + socklen);
> if (ai == NULL)
> {
> - free ((char *) canon);
Ok.
> @@ -1137,7 +1157,7 @@ gaih_inet (const char *name, const struct gaih_service *service,
> if (malloc_name)
> free ((char *) name);
> free (addrmem);
> - free (canonbuf);
> + free (canon);
Ok.
next prev parent reply other threads:[~2022-03-16 21:12 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-08 10:07 [PATCH 00/12] getaddrinfo facelift and fixes Siddhesh Poyarekar
2022-03-08 10:07 ` [PATCH 01/12] Simplify allocations and fix merge and continue actions [BZ #28931] Siddhesh Poyarekar
2022-03-08 13:52 ` Siddhesh Poyarekar
2022-03-08 21:12 ` Carlos O'Donell
2022-03-09 17:13 ` Siddhesh Poyarekar
2022-03-08 10:07 ` [PATCH 02/12] gaih_inet: Simplify canon name resolution Siddhesh Poyarekar
2022-03-08 10:07 ` [PATCH 03/12] getaddrinfo: Fix leak with AI_ALL [BZ #28852] Siddhesh Poyarekar
2022-03-08 11:00 ` Andreas Schwab
2022-03-08 13:45 ` Siddhesh Poyarekar
2022-03-08 10:07 ` [PATCH 04/12] gaih_inet: Simplify service resolution Siddhesh Poyarekar
2022-03-08 10:07 ` [PATCH 05/12] gaih_inet: make numeric lookup a separate routine Siddhesh Poyarekar
2022-03-08 10:07 ` [PATCH 06/12] gaih_inet: Split simple gethostbyname into its own function Siddhesh Poyarekar
2022-03-08 10:07 ` [PATCH 07/12] gaih_inet: Split nscd lookup code " Siddhesh Poyarekar
2022-03-08 10:07 ` [PATCH 08/12] gaih_inet: separate nss lookup loop " Siddhesh Poyarekar
2022-03-08 10:07 ` [PATCH 09/12] gaih_inet: make gethosts into a function Siddhesh Poyarekar
2022-03-08 10:07 ` [PATCH 10/12] gaih_inet: split loopback lookup into its own function Siddhesh Poyarekar
2022-03-08 10:07 ` [PATCH 11/12] gaih_inet: Split result generation " Siddhesh Poyarekar
2022-03-08 10:07 ` [PATCH 12/12] gethosts: Return EAI_MEMORY on allocation failure Siddhesh Poyarekar
2022-03-14 9:48 ` [PATCH v2 00/12] getaddrinfo facelift and fixes Siddhesh Poyarekar
2022-03-14 9:48 ` [PATCH v2 01/12] Simplify allocations and fix merge and continue actions [BZ #28931] Siddhesh Poyarekar
2022-03-14 10:30 ` Andreas Schwab
2022-03-14 14:15 ` Siddhesh Poyarekar
2022-03-16 20:47 ` DJ Delorie
2022-03-17 1:39 ` Siddhesh Poyarekar
2022-03-14 9:48 ` [PATCH v2 02/12] gaih_inet: Simplify canon name resolution Siddhesh Poyarekar
2022-03-16 21:12 ` DJ Delorie [this message]
2022-03-14 9:48 ` [PATCH v2 03/12] getaddrinfo: Fix leak with AI_ALL [BZ #28852] Siddhesh Poyarekar
2022-03-16 23:42 ` DJ Delorie
2022-03-17 2:30 ` Siddhesh Poyarekar
2022-03-14 9:48 ` [PATCH v2 04/12] gaih_inet: Simplify service resolution Siddhesh Poyarekar
2022-03-17 0:48 ` DJ Delorie
2022-03-14 9:48 ` [PATCH v2 05/12] gaih_inet: make numeric lookup a separate routine Siddhesh Poyarekar
2022-03-17 4:10 ` DJ Delorie
2022-03-14 9:48 ` [PATCH v2 06/12] gaih_inet: Split simple gethostbyname into its own function Siddhesh Poyarekar
2022-03-17 4:20 ` DJ Delorie
2022-03-14 9:48 ` [PATCH v2 07/12] gaih_inet: Split nscd lookup code " Siddhesh Poyarekar
2022-03-17 4:31 ` DJ Delorie
2022-03-17 6:22 ` Siddhesh Poyarekar
2022-03-14 9:48 ` [PATCH v2 08/12] gaih_inet: separate nss lookup loop " Siddhesh Poyarekar
2022-03-17 4:42 ` DJ Delorie
2022-03-17 4:59 ` Siddhesh Poyarekar
2022-03-14 9:48 ` [PATCH v2 09/12] gaih_inet: make gethosts into a function Siddhesh Poyarekar
2022-03-17 4:44 ` DJ Delorie
2022-03-14 9:48 ` [PATCH v2 10/12] gaih_inet: split loopback lookup into its own function Siddhesh Poyarekar
2022-03-17 4:51 ` DJ Delorie
2022-03-14 9:48 ` [PATCH v2 11/12] gaih_inet: Split result generation " Siddhesh Poyarekar
2022-03-17 5:05 ` DJ Delorie
2022-03-17 5:11 ` Siddhesh Poyarekar
2022-03-14 9:48 ` [PATCH v2 12/12] gethosts: Return EAI_MEMORY on allocation failure Siddhesh Poyarekar
2022-03-17 5:06 ` DJ Delorie
2022-03-14 13:21 ` [PATCH 00/12] getaddrinfo facelift and fixes Cristian Rodríguez
2022-03-14 14:16 ` Siddhesh Poyarekar
2022-03-17 8:11 ` [PATCH v3 " Siddhesh Poyarekar
2022-03-17 8:11 ` [PATCH v3 01/12] Simplify allocations and fix merge and continue actions [BZ #28931] Siddhesh Poyarekar
2022-03-17 21:47 ` DJ Delorie
2022-03-17 8:11 ` [PATCH v3 02/12] gaih_inet: Simplify canon name resolution Siddhesh Poyarekar
2022-03-17 8:11 ` [PATCH v3 03/12] getaddrinfo: Fix leak with AI_ALL [BZ #28852] Siddhesh Poyarekar
2022-03-17 8:11 ` [PATCH v3 04/12] gaih_inet: Simplify service resolution Siddhesh Poyarekar
2022-03-17 8:11 ` [PATCH v3 05/12] gaih_inet: make numeric lookup a separate routine Siddhesh Poyarekar
2022-03-17 8:11 ` [PATCH v3 06/12] gaih_inet: Split simple gethostbyname into its own function Siddhesh Poyarekar
2022-03-17 8:11 ` [PATCH v3 07/12] gaih_inet: Split nscd lookup code " Siddhesh Poyarekar
2022-03-17 22:02 ` DJ Delorie
2022-03-17 8:11 ` [PATCH v3 08/12] gaih_inet: separate nss lookup loop " Siddhesh Poyarekar
2022-03-17 22:05 ` DJ Delorie
2022-03-17 8:11 ` [PATCH v3 09/12] gaih_inet: make gethosts into a function Siddhesh Poyarekar
2022-03-17 8:11 ` [PATCH v3 10/12] gaih_inet: split loopback lookup into its own function Siddhesh Poyarekar
2022-03-17 8:11 ` [PATCH v3 11/12] gaih_inet: Split result generation " Siddhesh Poyarekar
2022-03-17 8:11 ` [PATCH v3 12/12] gethosts: Return EAI_MEMORY on allocation failure Siddhesh Poyarekar
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=xnk0ctioty.fsf@greed.delorie.com \
--to=dj@redhat.com \
--cc=libc-alpha@sourceware.org \
--cc=siddhesh@sourceware.org \
/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.
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 read-only IMAP folder(s) and NNTP newsgroup(s).