From: Siddhesh Poyarekar <siddhesh@gotplt.org>
To: "Frédéric Bérat" <fberat@redhat.com>, libc-alpha@sourceware.org
Subject: Re: [PATCH v3 13/16] libio/bits/stdio2.h: Clearly separate declaration from definitions
Date: Fri, 30 Jun 2023 11:29:45 -0400 [thread overview]
Message-ID: <8c33f812-f266-313d-3778-a734d532e15c@gotplt.org> (raw)
In-Reply-To: <20230628084246.778302-14-fberat@redhat.com>
On 2023-06-28 04:42, Frédéric Bérat wrote:
> ---
> libio/bits/stdio2-decl.h | 49 ++++++++++++++++++++++++++++++++++++++++
> libio/bits/stdio2.h | 48 ---------------------------------------
> 2 files changed, 49 insertions(+), 48 deletions(-)
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
>
> diff --git a/libio/bits/stdio2-decl.h b/libio/bits/stdio2-decl.h
> index 9d4668da21..114b06d24b 100644
> --- a/libio/bits/stdio2-decl.h
> +++ b/libio/bits/stdio2-decl.h
> @@ -84,18 +84,55 @@ extern int __obstack_vprintf_chk (struct obstack *__restrict __obstack,
> #endif
>
> #if __GLIBC_USE (DEPRECATED_GETS)
> +extern char *__REDIRECT (__gets_warn, (char *__str), gets)
> + __wur __warnattr ("please use fgets or getline instead, gets can't "
> + "specify buffer size");
> +
> extern char *__gets_chk (char *__str, size_t) __wur;
> #endif
>
> +extern char *__REDIRECT (__fgets_alias,
> + (char *__restrict __s, int __n,
> + FILE *__restrict __stream), fgets)
> + __wur __attr_access ((__write_only__, 1, 2));
> +extern char *__REDIRECT (__fgets_chk_warn,
> + (char *__restrict __s, size_t __size, int __n,
> + FILE *__restrict __stream), __fgets_chk)
> + __wur __warnattr ("fgets called with bigger size than length "
> + "of destination buffer");
> +
> extern char *__fgets_chk (char *__restrict __s, size_t __size, int __n,
> FILE *__restrict __stream)
> __wur __attr_access ((__write_only__, 1, 3));
>
> +extern size_t __REDIRECT (__fread_alias,
> + (void *__restrict __ptr, size_t __size,
> + size_t __n, FILE *__restrict __stream),
> + fread) __wur;
> +extern size_t __REDIRECT (__fread_chk_warn,
> + (void *__restrict __ptr, size_t __ptrlen,
> + size_t __size, size_t __n,
> + FILE *__restrict __stream),
> + __fread_chk)
> + __wur __warnattr ("fread called with bigger size * nmemb than length "
> + "of destination buffer");
> +
> extern size_t __fread_chk (void *__restrict __ptr, size_t __ptrlen,
> size_t __size, size_t __n,
> FILE *__restrict __stream) __wur;
>
> #ifdef __USE_GNU
> +extern char *__REDIRECT (__fgets_unlocked_alias,
> + (char *__restrict __s, int __n,
> + FILE *__restrict __stream), fgets_unlocked)
> + __wur __attr_access ((__write_only__, 1, 2));
> +extern char *__REDIRECT (__fgets_unlocked_chk_warn,
> + (char *__restrict __s, size_t __size, int __n,
> + FILE *__restrict __stream), __fgets_unlocked_chk)
> + __wur __warnattr ("fgets_unlocked called with bigger size than length "
> + "of destination buffer");
> +
> +
> extern char *__fgets_unlocked_chk (char *__restrict __s, size_t __size,
> int __n, FILE *__restrict __stream)
> __wur __attr_access ((__write_only__, 1, 3));
> @@ -103,6 +140,18 @@ extern char *__fgets_unlocked_chk (char *__restrict __s, size_t __size,
>
> #ifdef __USE_MISC
> # undef fread_unlocked
> +extern size_t __REDIRECT (__fread_unlocked_alias,
> + (void *__restrict __ptr, size_t __size,
> + size_t __n, FILE *__restrict __stream),
> + fread_unlocked) __wur;
> +extern size_t __REDIRECT (__fread_unlocked_chk_warn,
> + (void *__restrict __ptr, size_t __ptrlen,
> + size_t __size, size_t __n,
> + FILE *__restrict __stream),
> + __fread_unlocked_chk)
> + __wur __warnattr ("fread_unlocked called with bigger size * nmemb than "
> + "length of destination buffer");
> +
> extern size_t __fread_unlocked_chk (void *__restrict __ptr, size_t __ptrlen,
> size_t __size, size_t __n,
> FILE *__restrict __stream) __wur;
> diff --git a/libio/bits/stdio2.h b/libio/bits/stdio2.h
> index ad85f7df8b..71226408ab 100644
> --- a/libio/bits/stdio2.h
> +++ b/libio/bits/stdio2.h
> @@ -182,10 +182,6 @@ __NTH (obstack_vprintf (struct obstack *__restrict __obstack,
> #endif
>
> #if __GLIBC_USE (DEPRECATED_GETS)
> -extern char *__REDIRECT (__gets_warn, (char *__str), gets)
> - __wur __warnattr ("please use fgets or getline instead, gets can't "
> - "specify buffer size");
> -
> __fortify_function __wur char *
> gets (char *__str)
> {
> @@ -195,16 +191,6 @@ gets (char *__str)
> }
> #endif
>
> -extern char *__REDIRECT (__fgets_alias,
> - (char *__restrict __s, int __n,
> - FILE *__restrict __stream), fgets)
> - __wur __attr_access ((__write_only__, 1, 2));
> -extern char *__REDIRECT (__fgets_chk_warn,
> - (char *__restrict __s, size_t __size, int __n,
> - FILE *__restrict __stream), __fgets_chk)
> - __wur __warnattr ("fgets called with bigger size than length "
> - "of destination buffer");
> -
> __fortify_function __wur __fortified_attr_access (__write_only__, 1, 2) char *
> fgets (char *__restrict __s, int __n, FILE *__restrict __stream)
> {
> @@ -216,18 +202,6 @@ fgets (char *__restrict __s, int __n, FILE *__restrict __stream)
> return __fgets_chk (__s, sz, __n, __stream);
> }
>
> -extern size_t __REDIRECT (__fread_alias,
> - (void *__restrict __ptr, size_t __size,
> - size_t __n, FILE *__restrict __stream),
> - fread) __wur;
> -extern size_t __REDIRECT (__fread_chk_warn,
> - (void *__restrict __ptr, size_t __ptrlen,
> - size_t __size, size_t __n,
> - FILE *__restrict __stream),
> - __fread_chk)
> - __wur __warnattr ("fread called with bigger size * nmemb than length "
> - "of destination buffer");
> -
> __fortify_function __wur size_t
> fread (void *__restrict __ptr, size_t __size, size_t __n,
> FILE *__restrict __stream)
> @@ -241,16 +215,6 @@ fread (void *__restrict __ptr, size_t __size, size_t __n,
> }
>
> #ifdef __USE_GNU
> -extern char *__REDIRECT (__fgets_unlocked_alias,
> - (char *__restrict __s, int __n,
> - FILE *__restrict __stream), fgets_unlocked)
> - __wur __attr_access ((__write_only__, 1, 2));
> -extern char *__REDIRECT (__fgets_unlocked_chk_warn,
> - (char *__restrict __s, size_t __size, int __n,
> - FILE *__restrict __stream), __fgets_unlocked_chk)
> - __wur __warnattr ("fgets_unlocked called with bigger size than length "
> - "of destination buffer");
> -
> __fortify_function __wur __fortified_attr_access (__write_only__, 1, 2) char *
> fgets_unlocked (char *__restrict __s, int __n, FILE *__restrict __stream)
> {
> @@ -265,18 +229,6 @@ fgets_unlocked (char *__restrict __s, int __n, FILE *__restrict __stream)
>
> #ifdef __USE_MISC
> # undef fread_unlocked
> -extern size_t __REDIRECT (__fread_unlocked_alias,
> - (void *__restrict __ptr, size_t __size,
> - size_t __n, FILE *__restrict __stream),
> - fread_unlocked) __wur;
> -extern size_t __REDIRECT (__fread_unlocked_chk_warn,
> - (void *__restrict __ptr, size_t __ptrlen,
> - size_t __size, size_t __n,
> - FILE *__restrict __stream),
> - __fread_unlocked_chk)
> - __wur __warnattr ("fread_unlocked called with bigger size * nmemb than "
> - "length of destination buffer");
> -
> __fortify_function __wur size_t
> fread_unlocked (void *__restrict __ptr, size_t __size, size_t __n,
> FILE *__restrict __stream)
next prev parent reply other threads:[~2023-06-30 15:29 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-28 8:42 [PATCH v3 00/16] Allow glibc to be built with _FORTIFY_SOURCE Frédéric Bérat
2023-06-28 8:42 ` [PATCH v3 01/16] " Frédéric Bérat
2023-06-28 14:48 ` Joseph Myers
2023-06-28 8:42 ` [PATCH v3 02/16] Exclude routines from fortification Frédéric Bérat
2023-06-30 14:55 ` Siddhesh Poyarekar
2023-07-03 15:16 ` Frederic Berat
2023-07-04 16:04 ` Siddhesh Poyarekar
2023-06-28 8:42 ` [PATCH v3 03/16] sysdeps: Ensure ieee128*_chk routines to be properly named Frédéric Bérat
2023-06-30 14:58 ` Siddhesh Poyarekar
2023-06-30 15:55 ` Paul E Murphy
2023-06-30 15:57 ` Frederic Berat
2023-06-28 8:42 ` [PATCH v3 04/16] string: Ensure *_chk routines have their hidden builtin definition available Frédéric Bérat
2023-06-30 15:06 ` Siddhesh Poyarekar
2023-06-28 8:42 ` [PATCH v3 05/16] stdio: " Frédéric Bérat
2023-06-30 15:09 ` Siddhesh Poyarekar
2023-06-28 8:42 ` [PATCH v3 06/16] asprintf_chk: Ensure compatibility for both s390x and ppc64le Frédéric Bérat
2023-06-30 15:11 ` Siddhesh Poyarekar
2023-06-30 16:08 ` Rajalakshmi Srinivasaraghavan
2023-06-30 17:51 ` Paul E Murphy
2023-07-03 5:35 ` Frederic Berat
2023-06-28 8:42 ` [PATCH v3 07/16] misc/sys/cdefs.h: Create FORTIFY redirects for internal calls Frédéric Bérat
2023-06-30 15:13 ` Siddhesh Poyarekar
2023-06-28 8:42 ` [PATCH v3 08/16] wchar: Avoid PLT entries with _FORTIFY_SOURCE Frédéric Bérat
2023-06-30 15:17 ` Siddhesh Poyarekar
2023-06-30 15:26 ` Frederic Berat
2023-06-28 8:42 ` [PATCH v3 09/16] posix/bits/unistd.h: Clearly separate declaration from definitions Frédéric Bérat
2023-06-30 15:19 ` Siddhesh Poyarekar
2023-06-28 8:42 ` [PATCH v3 10/16] unistd: Avoid PLT entries with _FORTIFY_SOURCE Frédéric Bérat
2023-06-30 15:25 ` Siddhesh Poyarekar
2023-06-28 8:42 ` [PATCH v3 11/16] misc/bits/select2.h: Clearly separate declaration from definitions Frédéric Bérat
2023-06-30 15:26 ` Siddhesh Poyarekar
2023-06-28 8:42 ` [PATCH v3 12/16] misc/bits/syslog.h: Clearly separate declaration from definition Frédéric Bérat
2023-06-30 15:28 ` Siddhesh Poyarekar
2023-06-28 8:42 ` [PATCH v3 13/16] libio/bits/stdio2.h: Clearly separate declaration from definitions Frédéric Bérat
2023-06-30 15:29 ` Siddhesh Poyarekar [this message]
2023-06-28 8:42 ` [PATCH v3 14/16] libio/bits/stdio2-decl.h: Avoid PLT entries with _FORTIFY_SOURCE Frédéric Bérat
2023-06-30 15:30 ` Siddhesh Poyarekar
2023-06-30 15:38 ` Frederic Berat
2023-06-30 15:48 ` Siddhesh Poyarekar
2023-06-30 17:08 ` Siddhesh Poyarekar
2023-06-28 8:42 ` [PATCH v3 15/16] sysdeps/ieee754/ldbl-128ibm-compat: Fix warn unused result Frédéric Bérat
2023-06-30 15:33 ` Siddhesh Poyarekar
2023-06-28 8:42 ` [PATCH v3 16/16] Add --enable-fortify-source option Frédéric Bérat
2023-06-30 13:51 ` Siddhesh Poyarekar
2023-07-03 8:50 ` Andreas Schwab
2023-07-03 12:51 ` Adhemerval Zanella Netto
2023-07-04 12:40 ` Frederic Berat
2023-07-04 15:59 ` Siddhesh Poyarekar
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=8c33f812-f266-313d-3778-a734d532e15c@gotplt.org \
--to=siddhesh@gotplt.org \
--cc=fberat@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).