From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org, Andreas Schwab <schwab@linux-m68k.org>
Subject: [PATCH v3] inet: Return EAI_MEMORY when nrl_domainname() fails to allocate memory
Date: Thu, 25 Nov 2021 13:38:05 -0300 [thread overview]
Message-ID: <20211125163805.3744478-1-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <87ee7ltm34.fsf@igel.home>
It aligns NI_NOFQDN with default behavior for getnameinfo().
Checked on x86_64-linux-gnu.
---
Changes from v2:
* Simplify nrl_domainname_core.
---
inet/getnameinfo.c | 140 +++++++++++++++++++++++----------------------
1 file changed, 72 insertions(+), 68 deletions(-)
diff --git a/inet/getnameinfo.c b/inet/getnameinfo.c
index 2d2397e7dc..acf1538a37 100644
--- a/inet/getnameinfo.c
+++ b/inet/getnameinfo.c
@@ -83,94 +83,95 @@ libc_freeres_ptr (static char *domain);
now ignored. */
#define DEPRECATED_NI_IDN 192
-static void
+static bool
nrl_domainname_core (struct scratch_buffer *tmpbuf)
{
char *c;
struct hostent *h, th;
int herror;
- while (__gethostbyname_r ("localhost", &th,
- tmpbuf->data, tmpbuf->length,
+ while (__gethostbyname_r ("localhost", &th, tmpbuf->data, tmpbuf->length,
&h, &herror))
{
if (herror == NETDB_INTERNAL && errno == ERANGE)
{
if (!scratch_buffer_grow (tmpbuf))
- return;
+ return false;
}
else
break;
}
if (h != NULL && (c = strchr (h->h_name, '.')) != NULL)
- domain = __strdup (++c);
- else
{
- /* The name contains no domain information. Use the name
- now to get more information. */
- while (__gethostname (tmpbuf->data, tmpbuf->length))
- if (!scratch_buffer_grow (tmpbuf))
- return;
-
- if ((c = strchr (tmpbuf->data, '.')) != NULL)
- domain = __strdup (++c);
- else
- {
- /* We need to preserve the hostname. */
- size_t hstnamelen = strlen (tmpbuf->data) + 1;
- while (__gethostbyname_r (tmpbuf->data, &th,
- tmpbuf->data + hstnamelen,
- tmpbuf->length - hstnamelen,
- &h, &herror))
- {
- if (herror == NETDB_INTERNAL && errno == ERANGE)
- {
- if (!scratch_buffer_grow_preserve (tmpbuf))
- return;
- }
- else
- break;
- }
+ domain = __strdup (++c);
+ return domain != NULL;
+ }
- if (h != NULL && (c = strchr(h->h_name, '.')) != NULL)
- domain = __strdup (++c);
- else
- {
- struct in_addr in_addr;
+ /* The name contains no domain information. Use the name
+ now to get more information. */
+ while (__gethostname (tmpbuf->data, tmpbuf->length))
+ if (!scratch_buffer_grow (tmpbuf))
+ return false;
- in_addr.s_addr = htonl (INADDR_LOOPBACK);
+ if ((c = strchr (tmpbuf->data, '.')) != NULL)
+ {
+ domain = __strdup (++c);
+ return domain != NULL;
+ }
- while (__gethostbyaddr_r ((const char *) &in_addr,
- sizeof (struct in_addr),
- AF_INET, &th,
- tmpbuf->data,
- tmpbuf->length,
- &h, &herror))
- {
- if (herror == NETDB_INTERNAL && errno == ERANGE)
- {
- if (!scratch_buffer_grow (tmpbuf))
- return;
- }
- else
- break;
- }
+ /* We need to preserve the hostname. */
+ size_t hstnamelen = strlen (tmpbuf->data) + 1;
+ while (__gethostbyname_r (tmpbuf->data, &th, tmpbuf->data + hstnamelen,
+ tmpbuf->length - hstnamelen, &h, &herror))
+ {
+ if (herror == NETDB_INTERNAL && errno == ERANGE)
+ {
+ if (!scratch_buffer_grow_preserve (tmpbuf))
+ return false;
+ }
+ else
+ break;
+ }
- if (h != NULL && (c = strchr (h->h_name, '.')) != NULL)
- domain = __strdup (++c);
- }
+ if (h != NULL && (c = strchr(h->h_name, '.')) != NULL)
+ {
+ domain = __strdup (++c);
+ return domain != NULL;
+ }
+
+ struct in_addr in_addr = { .s_addr = htonl (INADDR_LOOPBACK) };
+
+ while (__gethostbyaddr_r ((const char *) &in_addr, sizeof (struct in_addr),
+ AF_INET, &th, tmpbuf->data, tmpbuf->length, &h,
+ &herror))
+ {
+ if (herror == NETDB_INTERNAL && errno == ERANGE)
+ {
+ if (!scratch_buffer_grow (tmpbuf))
+ return false;
}
+ else
+ break;
+ }
+
+ if (h != NULL && (c = strchr (h->h_name, '.')) != NULL)
+ {
+ domain = __strdup (++c);
+ return domain != NULL;
}
+ return true;
}
-static char *
+static bool
nrl_domainname (void)
{
static int not_first;
if (__glibc_likely (atomic_load_acquire (¬_first) != 0))
- return domain;
+ return true;
+
+ int r = true;
__libc_lock_define_initialized (static, lock);
__libc_lock_lock (lock);
@@ -180,16 +181,15 @@ nrl_domainname (void)
struct scratch_buffer tmpbuf;
scratch_buffer_init (&tmpbuf);
- nrl_domainname_core (&tmpbuf);
+ if ((r = nrl_domainname_core (&tmpbuf)))
+ atomic_store_release (¬_first, 1);
scratch_buffer_free (&tmpbuf);
-
- atomic_store_release (¬_first, 1);
}
__libc_lock_unlock (lock);
- return domain;
+ return r;
};
/* Copy a string to a destination buffer with length checking. Return
@@ -285,13 +285,17 @@ gni_host_inet_name (struct scratch_buffer *tmpbuf,
if (h)
{
- char *c;
- if ((flags & NI_NOFQDN)
- && (c = nrl_domainname ())
- && (c = strstr (h->h_name, c))
- && (c != h->h_name) && (*(--c) == '.'))
- /* Terminate the string after the prefix. */
- *c = '\0';
+ if (flags & NI_NOFQDN)
+ {
+ if (!nrl_domainname ())
+ return EAI_MEMORY;
+
+ char *c = domain;
+ if (c != NULL && (c = strstr (h->h_name, c))
+ && (c != h->h_name) && (*(--c) == '.'))
+ /* Terminate the string after the prefix. */
+ *c = '\0';
+ }
/* If requested, convert from the IDN format. */
bool do_idn = flags & NI_IDN;
--
2.32.0
prev parent reply other threads:[~2021-11-25 16:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-12 14:21 [PATCH v2 0/3] Fixes for getnameinfo() with NI_NOFQDN Adhemerval Zanella
2021-11-12 14:21 ` [PATCH v2 1/3] inet: Fix getnameinfo (NI_NOFQDN) race condition (BZ#28566) Adhemerval Zanella
2021-11-12 14:21 ` [PATCH v2 2/3] inet: Remove strdupa from nrl_domainname() Adhemerval Zanella
2021-11-12 14:21 ` [PATCH v2 3/3] inet: Return EAI_MEMORY when nrl_domainname() fails to allocate memory Adhemerval Zanella
2021-11-12 15:44 ` Andreas Schwab
2021-11-25 16:38 ` Adhemerval Zanella [this message]
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=20211125163805.3744478-1-adhemerval.zanella@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=libc-alpha@sourceware.org \
--cc=schwab@linux-m68k.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).