Message ID | 20220622233442.2777550-1-goldstein.w.n@gmail.com |
---|---|
State | New |
Headers | show |
Series | [v1] stdlib: Fixup mbstowcs NULL __dst handling. | expand |
On 23/06/2022 05:04, Noah Goldstein via Libc-alpha wrote: > commit 464d189b9622932a75302290625de84931656ec0 (origin/master, origin/HEAD) > Author: Noah Goldstein <goldstein.w.n@gmail.com> > Date: Wed Jun 22 08:24:21 2022 -0700 > > stdlib: Remove attr_write from mbstows if dst is NULL [BZ: 29265] > > Incorrectly called `__mbstowcs_chk` in the NULL __dst case which is > incorrect as in the NULL __dst case we are explicitly skipping > the objsize checks. > > As well, remove the `__always_inline` attribute which exists in > `__fortify_function`. > --- > stdlib/bits/stdlib.h | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) LGTM. Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org> > > diff --git a/stdlib/bits/stdlib.h b/stdlib/bits/stdlib.h > index d9c2d822a5..de1c3b20f0 100644 > --- a/stdlib/bits/stdlib.h > +++ b/stdlib/bits/stdlib.h > @@ -96,10 +96,10 @@ extern size_t __mbstowcs_chk (wchar_t *__restrict __dst, > const char *__restrict __src, > size_t __len, size_t __dstlen) __THROW > __attr_access ((__write_only__, 1, 3)) __attr_access ((__read_only__, 2)); > -extern size_t __REDIRECT_NTH (__mbstowcs_chk_nulldst, > +extern size_t __REDIRECT_NTH (__mbstowcs_nulldst, > (wchar_t *__restrict __dst, > const char *__restrict __src, > - size_t __len), mbstowcs_chk) > + size_t __len), mbstowcs) > __attr_access ((__read_only__, 2)); > extern size_t __REDIRECT_NTH (__mbstowcs_alias, > (wchar_t *__restrict __dst, > @@ -113,12 +113,12 @@ extern size_t __REDIRECT_NTH (__mbstowcs_chk_warn, > __warnattr ("mbstowcs called with dst buffer smaller than len " > "* sizeof (wchar_t)"); > > -__always_inline __fortify_function size_t > +__fortify_function size_t > __NTH (mbstowcs (wchar_t *__restrict __dst, const char *__restrict __src, > size_t __len)) > { > if (__builtin_constant_p (__dst == NULL) && __dst == NULL) > - return __mbstowcs_chk_nulldst (__dst, __src, __len); > + return __mbstowcs_nulldst (__dst, __src, __len); > else > return __glibc_fortify_n (mbstowcs, __len, sizeof (wchar_t), > __glibc_objsize (__dst), __dst, __src, __len);
On 23/06/2022 11:16, Siddhesh Poyarekar wrote: > On 23/06/2022 05:04, Noah Goldstein via Libc-alpha wrote: >> commit 464d189b9622932a75302290625de84931656ec0 (origin/master, >> origin/HEAD) >> Author: Noah Goldstein <goldstein.w.n@gmail.com> >> Date: Wed Jun 22 08:24:21 2022 -0700 >> >> stdlib: Remove attr_write from mbstows if dst is NULL [BZ: 29265] >> >> Incorrectly called `__mbstowcs_chk` in the NULL __dst case which is >> incorrect as in the NULL __dst case we are explicitly skipping >> the objsize checks. >> >> As well, remove the `__always_inline` attribute which exists in >> `__fortify_function`. >> --- >> stdlib/bits/stdlib.h | 8 ++++---- >> 1 file changed, 4 insertions(+), 4 deletions(-) > > LGTM. > > Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org> Please add a reference to bz #29279 in the commit log when you push this. Sid
diff --git a/stdlib/bits/stdlib.h b/stdlib/bits/stdlib.h index d9c2d822a5..de1c3b20f0 100644 --- a/stdlib/bits/stdlib.h +++ b/stdlib/bits/stdlib.h @@ -96,10 +96,10 @@ extern size_t __mbstowcs_chk (wchar_t *__restrict __dst, const char *__restrict __src, size_t __len, size_t __dstlen) __THROW __attr_access ((__write_only__, 1, 3)) __attr_access ((__read_only__, 2)); -extern size_t __REDIRECT_NTH (__mbstowcs_chk_nulldst, +extern size_t __REDIRECT_NTH (__mbstowcs_nulldst, (wchar_t *__restrict __dst, const char *__restrict __src, - size_t __len), mbstowcs_chk) + size_t __len), mbstowcs) __attr_access ((__read_only__, 2)); extern size_t __REDIRECT_NTH (__mbstowcs_alias, (wchar_t *__restrict __dst, @@ -113,12 +113,12 @@ extern size_t __REDIRECT_NTH (__mbstowcs_chk_warn, __warnattr ("mbstowcs called with dst buffer smaller than len " "* sizeof (wchar_t)"); -__always_inline __fortify_function size_t +__fortify_function size_t __NTH (mbstowcs (wchar_t *__restrict __dst, const char *__restrict __src, size_t __len)) { if (__builtin_constant_p (__dst == NULL) && __dst == NULL) - return __mbstowcs_chk_nulldst (__dst, __src, __len); + return __mbstowcs_nulldst (__dst, __src, __len); else return __glibc_fortify_n (mbstowcs, __len, sizeof (wchar_t), __glibc_objsize (__dst), __dst, __src, __len);