From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org
Subject: [PATCH v5 06/13] string: Implement strerror in terms of strerror_l
Date: Fri, 19 Jun 2020 10:43:45 -0300 [thread overview]
Message-ID: <20200619134352.297146-6-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <20200619134352.297146-1-adhemerval.zanella@linaro.org>
Checked on x86-64-linux-gnu, i686-linux-gnu, powerpc64le-linux-gnu,
and s390x-linux-gnu.
---
NEWS | 4 ++++
include/string.h | 4 ++++
string/strerror.c | 22 ++--------------------
string/strerror_l.c | 15 ++++++++++-----
sysdeps/mach/strerror_l.c | 4 +++-
5 files changed, 23 insertions(+), 26 deletions(-)
diff --git a/NEWS b/NEWS
index df03a34657..ec39b6e056 100644
--- a/NEWS
+++ b/NEWS
@@ -63,6 +63,10 @@ Deprecated and removed features, and other changes affecting compatibility:
compatibility symbols to support old binaries. All programs should use
strerror or strerror_r instead.
+* Both strerror and strerror_l now share the same internal buffer, meaning
+ that the returned string pointer might be invalidated or contents might
+ be overwritten in subsequent calls of either symbol.
+
Changes to build and runtime requirements:
* powerpc64le requires GCC 7.4 or newer. This is required for supporting
diff --git a/include/string.h b/include/string.h
index 4d622f1c03..3a33327cc0 100644
--- a/include/string.h
+++ b/include/string.h
@@ -4,6 +4,7 @@
/* Some of these are defined as macros in the real string.h, so we must
prototype them before including it. */
#include <sys/types.h>
+#include <locale.h>
extern void *__memccpy (void *__dest, const void *__src,
int __c, size_t __n);
@@ -50,6 +51,8 @@ extern int __ffs (int __i) __attribute__ ((const));
extern char *__strerror_r (int __errnum, char *__buf, size_t __buflen);
+extern char *__strerror_l (int __errnum, locale_t __loc);
+
/* Called as part of the thread shutdown sequence. */
void __strerror_thread_freeres (void) attribute_hidden;
@@ -113,6 +116,7 @@ libc_hidden_proto (memmem)
extern __typeof (memmem) __memmem;
libc_hidden_proto (__memmem)
libc_hidden_proto (__ffs)
+libc_hidden_proto (__strerror_l)
#if IS_IN (libc)
/* Avoid hidden reference to IFUNC symbol __explicit_bzero_chk. */
diff --git a/string/strerror.c b/string/strerror.c
index 283ab70f91..35c749016e 100644
--- a/string/strerror.c
+++ b/string/strerror.c
@@ -15,29 +15,11 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-#include <libintl.h>
-#include <stdio.h>
#include <string.h>
-#include <errno.h>
-
-/* Return a string describing the errno code in ERRNUM.
- The storage is good only until the next call to strerror.
- Writing to the storage causes undefined behavior. */
-libc_freeres_ptr (static char *buf);
+#include <locale/localeinfo.h>
char *
strerror (int errnum)
{
- char *ret = __strerror_r (errnum, NULL, 0);
- int saved_errno;
-
- if (__glibc_likely (ret != NULL))
- return ret;
- saved_errno = errno;
- if (buf == NULL)
- buf = malloc (1024);
- __set_errno (saved_errno);
- if (buf == NULL)
- return _("Unknown error");
- return __strerror_r (errnum, buf, 1024);
+ return __strerror_l (errnum, __libc_tsd_get (locale_t, LOCALE));
}
diff --git a/string/strerror_l.c b/string/strerror_l.c
index 309f42e66b..017bd14b99 100644
--- a/string/strerror_l.c
+++ b/string/strerror_l.c
@@ -20,8 +20,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <sys/param.h>
-#include <libc-symbols.h>
+#include <errno.h>
static __thread char *last_value;
@@ -38,8 +37,9 @@ translate (const char *str, locale_t loc)
/* Return a string describing the errno code in ERRNUM. */
char *
-strerror_l (int errnum, locale_t loc)
+__strerror_l (int errnum, locale_t loc)
{
+ int saved_errno = errno;
char *err = (char *) __get_errlist (errnum);
if (__glibc_unlikely (err == NULL))
{
@@ -48,11 +48,16 @@ strerror_l (int errnum, locale_t loc)
translate ("Unknown error ", loc), errnum) == -1)
last_value = NULL;
- return last_value;
+ err = last_value;
}
+ else
+ err = (char *) translate (err, loc);
- return (char *) translate (err, loc);
+ __set_errno (saved_errno);
+ return err;
}
+weak_alias (__strerror_l, strerror_l)
+libc_hidden_def (__strerror_l)
void
__strerror_thread_freeres (void)
diff --git a/sysdeps/mach/strerror_l.c b/sysdeps/mach/strerror_l.c
index f514af341e..b6c9fdbe80 100644
--- a/sysdeps/mach/strerror_l.c
+++ b/sysdeps/mach/strerror_l.c
@@ -42,7 +42,7 @@ translate (const char *str, locale_t loc)
/* Return a string describing the errno code in ERRNUM. */
char *
-strerror_l (int errnum, locale_t loc)
+__strerror_l (int errnum, locale_t loc)
{
int system;
int sub;
@@ -86,6 +86,8 @@ strerror_l (int errnum, locale_t loc)
return (char *) translate (es->subsystem[sub].codes[code], loc);
}
+weak_alias (__strerror_l, strerror_l)
+libc_hidden_def (__strerror_l)
/* This is called when a thread is exiting to free the last_value string. */
void
--
2.25.1
next prev parent reply other threads:[~2020-06-19 13:44 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-19 13:43 [PATCH v5 01/13] signal: Add signum-{generic,arch}.h Adhemerval Zanella
2020-06-19 13:43 ` [PATCH v5 02/13] signal: Move sys_siglist to a compat symbol Adhemerval Zanella
2020-07-02 18:32 ` Carlos O'Donell
2020-07-03 17:58 ` Adhemerval Zanella
2020-06-19 13:43 ` [PATCH v5 03/13] signal: Move sys_errlist " Adhemerval Zanella
2020-07-02 18:48 ` Carlos O'Donell
2020-07-03 19:17 ` Adhemerval Zanella
2020-06-19 13:43 ` [PATCH v5 04/13] linux: Fix __NSIG_WORDS and add __NSIG_BYTES Adhemerval Zanella
2020-07-02 19:08 ` Carlos O'Donell
2020-07-03 19:23 ` Adhemerval Zanella
2020-06-19 13:43 ` [PATCH v5 05/13] string: Remove old TLS usage on strsignal Adhemerval Zanella
2020-07-02 19:32 ` Carlos O'Donell
2020-07-03 19:26 ` Adhemerval Zanella
2020-06-19 13:43 ` Adhemerval Zanella [this message]
2020-07-02 19:44 ` [PATCH v5 06/13] string: Implement strerror in terms of strerror_l Carlos O'Donell
2020-07-03 19:53 ` Adhemerval Zanella
2020-06-19 13:43 ` [PATCH v5 07/13] string: Use tls-internal on strerror_l Adhemerval Zanella
2020-07-02 19:48 ` Carlos O'Donell
2020-06-19 13:43 ` [PATCH v5 08/13] string: Simplify strerror_r Adhemerval Zanella
2020-07-02 19:51 ` Carlos O'Donell
2020-06-19 13:43 ` [PATCH v5 09/13] string: Add strsignal test Adhemerval Zanella
2020-07-02 19:55 ` Carlos O'Donell
2020-07-02 20:01 ` Carlos O'Donell
2020-07-03 20:06 ` Adhemerval Zanella
2020-06-19 13:43 ` [PATCH v5 10/13] string: Add strerror, strerror_r, and strerror_l test Adhemerval Zanella
2020-07-02 20:02 ` Carlos O'Donell
2020-06-19 13:43 ` [PATCH v5 11/13] string: Add strerror_l on test-strerror-errno Adhemerval Zanella
2020-07-02 20:05 ` Carlos O'Donell
2020-06-19 13:43 ` [PATCH v5 12/13] string: Add sigabbrev_np and sigdescr_np Adhemerval Zanella
2020-07-02 21:13 ` Carlos O'Donell
2020-07-03 20:23 ` Adhemerval Zanella
[not found] ` <VI1PR08MB532546AD22FA628741788C5BFF670@VI1PR08MB5325.eurprd08.prod.outlook.com>
2020-07-08 11:18 ` Tamar Christina
2020-07-08 11:36 ` Florian Weimer
2020-07-08 11:48 ` Tamar Christina
2020-07-08 11:52 ` Florian Weimer
2020-07-08 12:16 ` Tamar Christina
2020-07-08 12:23 ` Adhemerval Zanella
2020-06-19 13:43 ` [PATCH v5 13/13] string: Add strerrorname and strerrordesc Adhemerval Zanella
2020-07-02 21:43 ` Carlos O'Donell
2020-07-03 21:01 ` Adhemerval Zanella
2020-07-03 21:19 ` Carlos O'Donell
2020-07-03 22:34 ` Adhemerval Zanella
2020-07-06 12:43 ` Carlos O'Donell
2020-07-06 13:57 ` [PATCH v6] string: Add strerrorname_np and strerrordesc_np Adhemerval Zanella
2020-07-06 14:04 ` Andreas Schwab
2020-07-06 14:06 ` Adhemerval Zanella
2020-07-06 15:07 ` Carlos O'Donell
2020-07-02 18:26 ` [PATCH v5 01/13] signal: Add signum-{generic,arch}.h Carlos O'Donell
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=20200619134352.297146-6-adhemerval.zanella@linaro.org \
--to=adhemerval.zanella@linaro.org \
--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).