From: Siddhesh Poyarekar <siddhesh@gotplt.org>
To: Florian Weimer <fweimer@redhat.com>
Cc: libc-alpha@sourceware.org
Subject: Re: [PATCH 1/2] Implement strlcpy and strlcat [BZ #178]
Date: Thu, 20 Apr 2023 07:45:05 -0400 [thread overview]
Message-ID: <bf93ae25-ea97-2916-3e94-ee8198d4a075@gotplt.org> (raw)
In-Reply-To: <87ildqesbf.fsf@oldenburg.str.redhat.com>
On 2023-04-20 06:55, Florian Weimer wrote:
> * Siddhesh Poyarekar:
>
>>> index 673cfd7272..0c78ad2539 100644
>>> --- a/include/string.h
>>> +++ b/include/string.h
>>> @@ -88,6 +88,10 @@ libc_hidden_proto (__stpcpy)
>>> # define __stpcpy(dest, src) __builtin_stpcpy (dest, src)
>>> #endif
>>> libc_hidden_proto (__stpncpy)
>>> +extern __typeof (strlcpy) __strlcpy;
>>> +libc_hidden_proto (__strlcpy)
>>> +extern __typeof (strlcat) __strlcat;
>>> +libc_hidden_proto (__strlcat)
>>> libc_hidden_proto (__rawmemchr)
>>> libc_hidden_proto (__strcasecmp)
>>> libc_hidden_proto (__strcasecmp_l)
>>
>> Do we want to delay doing this until we have an actual internal use of
>> these interfaces?
>
> The *_chk functions need these aliases today.
Ack.
>>> +__fortify_function size_t
>>> +__NTH (strlcat (char *__restrict __dest, const char *__restrict __src,
>>> + size_t __n))
>>> +{
>>> + if (__glibc_objsize (__dest) != (size_t) -1
>>> + && (!__builtin_constant_p (__n > __glibc_objsize (__dest))
>>> + || __n > __glibc_objsize (__dest)))
>>> + return __strlcat_chk (__dest, __src, __n, __glibc_objsize (__dest));
>>> + return __strlcat_alias (__dest, __src, __n);
>>> +}
>>> +#endif /* __USE_MISC */
>>> +
>>
>> Couldn't we use the __glibc_fortify macros here?
>
> Do you have a concrete proposal? I was just following what we have for
> stpncpy and other functions.
I don't, but I'll give it a shot.
> I don't think it's possible to use the generic macros for
> wcslcpy/wcslcat because of the bytes vs wide characters distinction.
Hmm, there's __glibc_fortify_n for wide chars which __wcsncpy_chk uses,
or have I misunderstood your comment?
>>> +size_t
>>> +__strlcpy (char *__restrict dest, const char *__restrict src, size_t size)
>>> +{
>>> + size_t src_length = strlen (src);
>>> +
>>> + if (__glibc_unlikely (src_length >= size))
>>> + {
>>> + if (size > 0)
>>> + {
>>> + /* Copy the leading portion of the string. The last
>>> + character is subsequently overwritten with the NUL
>>> + terminator, but the destination size is usually a
>>> + multiple of a small power of two, so writing it twice
>>> + should be more efficient than copying an odd number of
>>> + bytes. */
>>> + memcpy (dest, src, size);
>>> + dest[size - 1] = '\0';
>>> + }
>>> + }
>>> + else
>>> + /* Copy the string and its terminating NUL character. */
>>> + memcpy (dest, src, src_length + 1);
>>
>> size == 0 is undefined anyway; we return without touching the dest
>> because that's convenient for us. OK.
>
> size == 0 is defined in OpenBSD via snprintf equivalence, but maybe
> that's over-interpreting the manual page.
Doesn't seem like over-interpreting to me:
"The strlcpy() and strlcat() functions copy and concatenate strings with
the same input parameters and output result as snprintf(3)"
We should probably just pick a lane then (and specify it in the manual),
and snprintf equivalence is probably a reasonable take in terms of safety.
Thanks,
Sid
next prev parent reply other threads:[~2023-04-20 11:45 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-05 11:20 [PATCH 0/2] strlcpy/strlcat/wcslcpy/wcscat implementation Florian Weimer
2023-04-05 11:20 ` [PATCH 1/2] Implement strlcpy and strlcat [BZ #178] Florian Weimer
2023-04-05 13:18 ` Adhemerval Zanella Netto
2023-04-06 9:18 ` Florian Weimer
2023-04-06 14:22 ` Siddhesh Poyarekar
2023-04-06 15:09 ` Florian Weimer
2023-04-06 21:29 ` Alejandro Colomar
2023-04-11 14:28 ` Siddhesh Poyarekar
2023-04-20 10:55 ` Florian Weimer
2023-04-20 11:45 ` Siddhesh Poyarekar [this message]
2023-04-21 17:45 ` Florian Weimer
2023-04-06 21:21 ` Alejandro Colomar
2023-04-06 21:35 ` Florian Weimer
2023-04-06 22:15 ` Alejandro Colomar
2023-04-06 22:19 ` Alejandro Colomar
2023-04-06 22:34 ` Alejandro Colomar
2023-04-08 22:08 ` Paul Eggert
2023-04-09 15:29 ` Paul Eggert
2023-04-13 11:37 ` Florian Weimer
2023-04-13 14:39 ` Paul Eggert
2023-04-13 17:59 ` Paul Eggert
2023-04-20 8:07 ` Florian Weimer
2023-04-21 19:00 ` Paul Eggert
2023-04-28 8:49 ` Florian Weimer
2023-04-05 11:20 ` [PATCH 2/2] Add the wcslcpy, wcslcat functions Florian Weimer
2023-04-08 22:09 ` Paul Eggert
2023-04-05 12:30 ` [PATCH 0/2] strlcpy/strlcat/wcslcpy/wcscat implementation Alejandro Colomar
2023-04-08 22:05 ` Paul Eggert
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=bf93ae25-ea97-2916-3e94-ee8198d4a075@gotplt.org \
--to=siddhesh@gotplt.org \
--cc=fweimer@redhat.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).