From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: Florian Weimer <fweimer@redhat.com>,
Adhemerval Zanella via Libc-alpha <libc-alpha@sourceware.org>
Cc: leonardo.macchia@gmail.com
Subject: Re: [PATCH 2/3] inet: Remove strdupa from nrl_domainname()
Date: Thu, 11 Nov 2021 10:36:21 -0300 [thread overview]
Message-ID: <458c6b92-0344-f1d5-748a-38208d8c5713@linaro.org> (raw)
In-Reply-To: <87mtmb14wm.fsf@oldenburg.str.redhat.com>
On 11/11/2021 05:18, Florian Weimer wrote:
> * Adhemerval Zanella via Libc-alpha:
>
>> We can use the already in place scratch_buffer.
>>
>> Checked on x86_64-linux-gnu.
>> ---
>> inet/getnameinfo.c | 8 ++++----
>> 1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/inet/getnameinfo.c b/inet/getnameinfo.c
>> index 58ebbb1154..69a94604bd 100644
>> --- a/inet/getnameinfo.c
>> +++ b/inet/getnameinfo.c
>> @@ -127,10 +127,10 @@ nrl_domainname (void)
>> else
>> {
>> /* We need to preserve the hostname. */
>> - const char *hstname = strdupa (tmpbuf.data);
>> - while (__gethostbyname_r (hstname, &th,
>> - tmpbuf.data,
>> - tmpbuf.length,
>> + 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)
>
> Can you use malloc instead? scratch_buffer_grow_preserve is a bit of an
> outlier in the interface.
It would require to add more complexity, since now we have two allocations
to handle (the hstname and the scratch_buffer) and on fast patch it would
actually require a malloc call, where mostly likely it would be done in
the stack fror scratch_buffer. I am not sure it is really an improvement
here.
next prev parent reply other threads:[~2021-11-11 13:36 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-10 18:58 [PATCH 0/3] Fixes for getnameinfo() with NI_NOFQDN Adhemerval Zanella
2021-11-10 18:58 ` [PATCH 1/3] inet: Fix getnameinfo (NI_NOFQDN) race condition (BZ#28566) Adhemerval Zanella
2021-11-11 8:16 ` Florian Weimer
2021-11-11 13:34 ` Adhemerval Zanella
2021-11-11 13:54 ` Florian Weimer
2021-11-11 14:09 ` Adhemerval Zanella
2021-11-11 14:12 ` Florian Weimer
2021-11-11 14:17 ` Adhemerval Zanella
2021-11-11 17:41 ` Florian Weimer
2021-11-10 18:58 ` [PATCH 2/3] inet: Remove strdupa from nrl_domainname() Adhemerval Zanella
2021-11-11 8:18 ` Florian Weimer
2021-11-11 13:36 ` Adhemerval Zanella [this message]
2021-11-11 14:00 ` Florian Weimer
2021-11-10 18:58 ` [PATCH 3/3] inet: Return EAI_MEMORY when nrl_domainname() fails to allocate memory Adhemerval Zanella
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=458c6b92-0344-f1d5-748a-38208d8c5713@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=fweimer@redhat.com \
--cc=leonardo.macchia@gmail.com \
--cc=libc-alpha@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).