From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dog.elm.relay.mailchannels.net (dog.elm.relay.mailchannels.net [23.83.212.48]) by sourceware.org (Postfix) with ESMTPS id 624673857C47 for ; Mon, 14 Mar 2022 09:49:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 624673857C47 X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id DA915461EDC for ; Mon, 14 Mar 2022 09:49:05 +0000 (UTC) Received: from pdx1-sub0-mail-a305.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 54AEB460CD5 for ; Mon, 14 Mar 2022 09:49:03 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1647251345; a=rsa-sha256; cv=none; b=u3wEs4tp/27zS3x0/kui3BXXdZw3feuC9H1Rvm6sqn9A7BwAtXYKfjGJ0EGKvIeVK3Negm LxtbaDfKNfmzxPL21qOmIJ/ESMf5vZHXNaWed1ruS31X37Rs67QLtp/2m9nJ1WWo0zDVjA nzg/URbqpL9CwuyAVdf4pCmk5fAFTnoTTpX/aOPk9h36i0JO2NBjiaimXv1Hov3qYfti/W buSo7nGfoQAZV9KTtktpjjD7+65ChnQqL7BeJ+an1gHYVFuLN/XgyiFN1ZoRKm6VelLVF8 sbv0aYxvjCdop4gNHaKYkGNni0fmdX1ySY6yJNy/5/njMmJaX9xzBDHUTsdbbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1647251345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VYm81me2qsvZNIo9Y6GE+T0uv6kme6lwmNJ4KR5XplQ=; b=p0kL0hOWUN4FYTrMTyQQli4GRyg0siz2ML58jjBNVNhYGnexaYwM0TWGOhoeXKlHpl8B4q ArvgG06ERSx1/h6qnWHqkl6MtT60eqFZaQD2TXTCrUzZyxAh29VmvNr7y/z3bi3aXfE0sc 4xRmI/26j2dSjl1++Oc2rRuwrBncyY3cmQOJa3N/+5HL6hue564MZVG/relUMC4elh1WZw ac7Otek3Gevr5zPgBS9chhEDT2M2YHYMTVkxAmVNzW0nUWXWVoBdUpcdch0ITbp2LaSCOf /N2nQQF1cndJkNCKkQSwik++Iqjlu5gVz4lh1Wx38APEJBsvZAiBxHK8WFd+lQ== ARC-Authentication-Results: i=1; rspamd-c9cb649d9-tk4s9; auth=pass smtp.auth=dreamhost smtp.mailfrom=siddhesh@sourceware.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from pdx1-sub0-mail-a305.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.102.3.5 (trex/6.5.3); Mon, 14 Mar 2022 09:49:05 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Spicy-Ski: 41884bf1670066eb_1647251345640_413973809 X-MC-Loop-Signature: 1647251345640:3446722188 X-MC-Ingress-Time: 1647251345640 Received: from rhbox.redhat.com (unknown [106.220.192.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a305.dreamhost.com (Postfix) with ESMTPSA id 4KHBZ70fzdz2d for ; Mon, 14 Mar 2022 02:48:46 -0700 (PDT) From: Siddhesh Poyarekar To: libc-alpha@sourceware.org Subject: [PATCH v2 02/12] gaih_inet: Simplify canon name resolution Date: Mon, 14 Mar 2022 15:18:25 +0530 Message-Id: <20220314094835.1159523-3-siddhesh@sourceware.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220314094835.1159523-1-siddhesh@sourceware.org> References: <20220308100717.1006126-1-siddhesh@sourceware.org> <20220314094835.1159523-1-siddhesh@sourceware.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1170.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_NONE, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NEUTRAL, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Mar 2022 09:49:09 -0000 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. Signed-off-by: Siddhesh Poyarekar --- sysdeps/posix/getaddrinfo.c | 130 +++++++++++++++++++++--------------- 1 file changed, 75 insertions(+), 55 deletions(-) diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c index 454a27eb2f..df164a3e96 100644 --- a/sysdeps/posix/getaddrinfo.c +++ b/sysdeps/posix/getaddrinfo.c @@ -285,7 +285,7 @@ convert_hostent_to_gaih_addrtuple (const struct addrinfo *req, \ if (localcanon != NULL && canon == NULL) \ { \ - canonbuf = __strdup (localcanon); \ + char *canonbuf = __strdup (localcanon); \ if (canonbuf == NULL) \ { \ __resolv_context_put (res_ctx); \ @@ -323,6 +323,41 @@ getcanonname (nss_action_list nip, struct gaih_addrtuple *at, const char *name) return __strdup (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; +} + static int gaih_inet (const char *name, const struct gaih_service *service, const struct addrinfo *req, struct addrinfo **pai, @@ -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; const char *orig_name = name; /* Reserve stack memory for the scratch buffer in the getaddrinfo @@ -453,7 +488,6 @@ gaih_inet (const char *name, const struct gaih_service *service, bool malloc_name = false; struct gaih_addrtuple *addrmem = NULL; - char *canonbuf = NULL; int result = 0; if (name != NULL) @@ -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; + } goto process_list; } @@ -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; + } goto process_list; } @@ -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); if (canonbuf == NULL) { result = -EAI_MEMORY; @@ -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; if (do_merge) @@ -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; + } struct gaih_addrtuple **pat = &at; @@ -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); if (canonbuf == NULL) { __resolv_context_put (res_ctx); @@ -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; + struct gaih_servtuple *st2; struct gaih_addrtuple *at2 = at; size_t socklen; @@ -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; - } - } - } - } - family = at2->family; if (family == AF_INET6) { @@ -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); result = -EAI_MEMORY; goto free_and_return; } @@ -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); return result; } -- 2.35.1