From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 55A9C3871020 for ; Fri, 30 Jun 2023 15:26:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 55A9C3871020 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688138786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=K1h7BiTlQdJMHHNVpH5k5GeB11Q7Z+p70XjCHHP42vU=; b=Dz6IsaXSwScIJQZ0Y79Ze37ONRCf8DReaAqN2+Z9ZdUlry5o+VQeVNy5ETrJAI/wowqmCu 0DbDoI6sSuv8g7DLCDCLu2Cz8ZGVxjboIS+InMjYKw+G8orXEnc580II/n53RsjO0cO3mG 3gKMGCIHN0oyzJuXZfclLmsGdqPkTts= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-412-vYeqlh8zMRuUvZDcOwaj9g-1; Fri, 30 Jun 2023 11:26:24 -0400 X-MC-Unique: vYeqlh8zMRuUvZDcOwaj9g-1 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-51d8823eb01so1156939a12.1 for ; Fri, 30 Jun 2023 08:26:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688138783; x=1690730783; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=K1h7BiTlQdJMHHNVpH5k5GeB11Q7Z+p70XjCHHP42vU=; b=k4p+ro1m3cTHmZStnjFoY2NBIYGudilcgF8zGIwjAsQYtrQAU1sg5dIY4AjuZar1lD bX83DTedsjRRZkZwAnQAeHTvNftIxGrdDW0G/5F9bYH4DM0vd8ZH2B2YuyR2EJHOHbtO tN14lxSVCfHS9sxVK9OXiFIUDeXYTpRZEpguYQhDIST7BqDMnRtn9TFP9SP0Eo1wby19 g3nFNI5IFmSwPzvQt8Lf2Ng8VmiP9b80ojXn2xRbn/eeeiRbNAuMSdz3zfQzh9SozECQ Mf2QvNBOUO0RCENwGLgEHy/C9j97hhwYPTj8lvLE2BCfN6IZIFHWOLQeXhPU/v5lAvux 0x3Q== X-Gm-Message-State: ABy/qLZOQ+wLoFh+qrNmoztMY/JhOFYtw3LbeUKD549im6LzRk1poXcl +6JdVv9b9XNx5LBZ+T5MSf+H068ak2Hv166WGA1E3tqjtbhy4qFXfiHYY+0MCBjrXipgS6UdGhn rfcf5jC95WfRgbC9HL/bUVahGLnxEY9e5a91dMqwLVZA/ X-Received: by 2002:aa7:c514:0:b0:51d:e182:d80b with SMTP id o20-20020aa7c514000000b0051de182d80bmr1726437edq.21.1688138782867; Fri, 30 Jun 2023 08:26:22 -0700 (PDT) X-Google-Smtp-Source: APBJJlGdrFV6kQoQKNUJCokrWtdhP4ucgBAw9FW7EfTE490beCEGgdF37RFf2Hr7FoYacUj3ptRsnCRrlwBbJ9fzTkE= X-Received: by 2002:aa7:c514:0:b0:51d:e182:d80b with SMTP id o20-20020aa7c514000000b0051de182d80bmr1726423edq.21.1688138782547; Fri, 30 Jun 2023 08:26:22 -0700 (PDT) MIME-Version: 1.0 References: <20230628084246.778302-1-fberat@redhat.com> <20230628084246.778302-9-fberat@redhat.com> <7923496a-cdfa-8a3b-a3b3-1f8766e0613c@gotplt.org> In-Reply-To: <7923496a-cdfa-8a3b-a3b3-1f8766e0613c@gotplt.org> From: Frederic Berat Date: Fri, 30 Jun 2023 17:26:11 +0200 Message-ID: Subject: Re: [PATCH v3 08/16] wchar: Avoid PLT entries with _FORTIFY_SOURCE To: Siddhesh Poyarekar Cc: libc-alpha@sourceware.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/alternative; boundary="00000000000077397e05ff5a70d0" X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,HTML_MESSAGE,KAM_SHORT,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --00000000000077397e05ff5a70d0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, Jun 30, 2023 at 5:17=E2=80=AFPM Siddhesh Poyarekar wrote: > > > On 2023-06-28 04:42, Fr=C3=A9d=C3=A9ric B=C3=A9rat wrote: > > The change is meant to avoid unwanted PLT entries for the wmemset and > > wcrtomb routines when _FORTIFY_SOURCE is set. > > > > On top of that, ensure that *_chk routines have their hidden builtin > > definitions available. > > --- > > Looks mostly OK except for a question below. > > > debug/wcrtomb_chk.c | 1 + > > debug/wmemset_chk.c | 1 + > > include/wchar.h | 15 +++++++++++++++ > > .../ldbl-128ibm-compat/ieee128-fwprintf_chk.c | 1 + > > sysdeps/x86_64/multiarch/wmemset_chk.c | 4 ++++ > > wcsmbs/bits/wchar2-decl.h | 4 ++-- > > 6 files changed, 24 insertions(+), 2 deletions(-) > > > > diff --git a/debug/wcrtomb_chk.c b/debug/wcrtomb_chk.c > > index 657be7471d..c156fe09c1 100644 > > --- a/debug/wcrtomb_chk.c > > +++ b/debug/wcrtomb_chk.c > > @@ -28,3 +28,4 @@ __wcrtomb_chk (char *s, wchar_t wchar, mbstate_t *ps, > size_t buflen) > > { > > return __wcrtomb_internal (s, wchar, ps, buflen); > > } > > +libc_hidden_def (__wcrtomb_chk) > > diff --git a/debug/wmemset_chk.c b/debug/wmemset_chk.c > > index e11a92815e..1e7fc4fdea 100644 > > --- a/debug/wmemset_chk.c > > +++ b/debug/wmemset_chk.c > > @@ -26,3 +26,4 @@ __wmemset_chk (wchar_t *s, wchar_t c, size_t n, size_t > dstlen) > > > > return wmemset (s, c, n); > > } > > +libc_hidden_builtin_def (__wmemset_chk) > > diff --git a/include/wchar.h b/include/wchar.h > > index 7b763bc24f..484e6b3fef 100644 > > --- a/include/wchar.h > > +++ b/include/wchar.h > > @@ -166,6 +166,8 @@ libc_hidden_proto (putwc) > > > > libc_hidden_proto (mbrtowc) > > libc_hidden_proto (wcrtomb) > > +libc_hidden_proto (__wcrtomb_chk) > > + > > extern int __wcscmp (const wchar_t *__s1, const wchar_t *__s2) > > __THROW __attribute_pure__; > > libc_hidden_proto (__wcscmp) > > @@ -260,16 +262,25 @@ extern wchar_t *__wcschrnul (const wchar_t *__s, > wchar_t __wc) > > > > extern wchar_t *__wmemset_chk (wchar_t *__s, wchar_t __c, size_t __n, > > size_t __ns) __THROW; > > +libc_hidden_builtin_proto (__wmemset_chk) > > > > extern int __vfwscanf (__FILE *__restrict __s, > > const wchar_t *__restrict __format, > > __gnuc_va_list __arg) > > attribute_hidden > > /* __attribute__ ((__format__ (__wscanf__, 2, 0)) */; > > + > > +extern int __swprintf_chk (wchar_t *__restrict __s, size_t __n, > > + int __flag, size_t __s_len, > > + const wchar_t *__restrict __format, ...) > > + __THROW /* __attribute__ ((__format__ (__wprintf__, 5, 6))) */; > > + > > extern int __fwprintf (__FILE *__restrict __s, > > const wchar_t *__restrict __format, ...) > > attribute_hidden > > /* __attribute__ ((__format__ (__wprintf__, 2, 3))) */; > > +extern int __wprintf_chk (int __flag, const wchar_t *__restrict > __format, > > + ...); > > extern int __vfwprintf_chk (FILE *__restrict __s, int __flag, > > const wchar_t *__restrict __format, > > __gnuc_va_list __arg) > > @@ -279,6 +290,10 @@ extern int __vswprintf_chk (wchar_t *__restrict > __s, size_t __n, > > const wchar_t *__restrict __format, > > __gnuc_va_list __arg) > > /* __attribute__ ((__format__ (__wprintf__, 5, 0))) */; > > +extern int __fwprintf_chk (__FILE *__restrict __stream, int __flag, > > + const wchar_t *__restrict __format, ...); > > +extern int __vwprintf_chk (int __flag, const wchar_t *__restrict > __format, > > + __gnuc_va_list __ap); > > > > extern int __isoc99_fwscanf (__FILE *__restrict __stream, > > const wchar_t *__restrict __format, ...); > > diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-fwprintf_chk.c > b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-fwprintf_chk.c > > index 5b6cc3e768..10658ab125 100644 > > --- a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-fwprintf_chk.c > > +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-fwprintf_chk.c > > @@ -17,6 +17,7 @@ > > . */ > > > > #include > > +#include > > #include > > Why do you need this? > Probably a leftover from my investigation. I'll double check. > > > extern int > > diff --git a/sysdeps/x86_64/multiarch/wmemset_chk.c > b/sysdeps/x86_64/multiarch/wmemset_chk.c > > index ac93a1f376..00edf44918 100644 > > --- a/sysdeps/x86_64/multiarch/wmemset_chk.c > > +++ b/sysdeps/x86_64/multiarch/wmemset_chk.c > > @@ -28,4 +28,8 @@ > > > > libc_ifunc_redirected (__redirect_wmemset_chk, __wmemset_chk, > > IFUNC_SELECTOR ()); > > +# ifdef SHARED > > +__hidden_ver1 (__wmemset_chk, __GI___wmemset_chk, > __redirect_wmemset_chk) > > + __attribute__ ((visibility ("hidden"))) __attribute_copy__ > (__wmemset_chk); > > +# endif > > #endif > > diff --git a/wcsmbs/bits/wchar2-decl.h b/wcsmbs/bits/wchar2-decl.h > > index f3a2fd3c99..08c8ebd0e8 100644 > > --- a/wcsmbs/bits/wchar2-decl.h > > +++ b/wcsmbs/bits/wchar2-decl.h > > @@ -71,7 +71,7 @@ extern wchar_t *__REDIRECT_NTH (__wmempcpy_chk_warn, > > > > extern wchar_t *__wmemset_chk (wchar_t *__s, wchar_t __c, size_t __n, > > size_t __ns) __THROW; > > -extern wchar_t *__REDIRECT_NTH (__wmemset_alias, (wchar_t *__s, wchar_t > __c, > > +extern wchar_t *__REDIRECT_FORTIFY_NTH (__wmemset_alias, (wchar_t *__s, > wchar_t __c, > > size_t __n), > wmemset); > > extern wchar_t *__REDIRECT_NTH (__wmemset_chk_warn, > > (wchar_t *__s, wchar_t __c, size_t __n, > > @@ -203,7 +203,7 @@ extern wchar_t *__REDIRECT > (__fgetws_unlocked_chk_warn, > > extern size_t __wcrtomb_chk (char *__restrict __s, wchar_t __wchar, > > mbstate_t *__restrict __p, > > size_t __buflen) __THROW __wur; > > -extern size_t __REDIRECT_NTH (__wcrtomb_alias, > > +extern size_t __REDIRECT_FORTIFY_NTH (__wcrtomb_alias, > > (char *__restrict __s, wchar_t > __wchar, > > mbstate_t *__restrict __ps), > wcrtomb) __wur; > > > > --00000000000077397e05ff5a70d0--