From patchwork Fri Jun 19 13:43:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 39679 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CD4E4393C89D; Fri, 19 Jun 2020 13:44:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CD4E4393C89D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1592574250; bh=cvFW5SAOWsXJ2uaew9V7A1HLUUiuXXF3xHbZH3LVLok=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=Xk4JZIRDyp/KVB3GhJeWylE0QR8b2xH7fdZZIYT8hHisZI2Ak8vJwzOgIDqA0lLUG /p5Prf9tPO88s6C4Z1tXq9Jn/VfjcIPnrXyDqoKaDHPaYMrCA+GbpTNZ/0AYCLxcKM pE0qKmf6qItYt2v6s7Yjfe3ws63A5LQhnOu6bLQo= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x841.google.com (mail-qt1-x841.google.com [IPv6:2607:f8b0:4864:20::841]) by sourceware.org (Postfix) with ESMTPS id 9D5453939C21 for ; Fri, 19 Jun 2020 13:44:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 9D5453939C21 Received: by mail-qt1-x841.google.com with SMTP id h23so50108qtr.0 for ; Fri, 19 Jun 2020 06:44:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cvFW5SAOWsXJ2uaew9V7A1HLUUiuXXF3xHbZH3LVLok=; b=BnMBg93ZKDU4IBi6Tcd1zDEuIzMXNA5/yjzKl1icy9NzdQoR4dZO0NmkgWN6VrbPBS iz227hZWLPu+nlVryaiAR4l6EneagpCjRzaEDFiClxfYNy323DPFqNa9JiHwOQpGfuNn VjVo8h+6r0iBHjxCx4I14yfbRPvSUhSPNbqCkbSQNo32K33zNUvg0JEs2B+iQxA/Xf8V pCpAln/2czc2PmMvXTF1HpeE3ReNA7SmPKucoHnmienF6AcS8LvBdQGft3KmZOdDEbby nbOx0DAr8JirDT0w0NEvpAQmPM5otyK1ARH9FFlreOZ8FfdYoc3HMcMcUbIDzt/JWFji n0pg== X-Gm-Message-State: AOAM531wvtjB6e2y72l23ZYG7oekSXGTbSCqxu0zjDyw/BW/8FgXXTqP kRkkiwnYvTcY0VRjycRvz7vS0IvMeik= X-Google-Smtp-Source: ABdhPJxADODr+NHh4VT/NZgZ6d1K4gTemWvNVGcrJOfTFM0iL5MvDJH+gjCDN8Js2UUTkYfvaMWVuA== X-Received: by 2002:ac8:6a11:: with SMTP id t17mr3542503qtr.272.1592574246919; Fri, 19 Jun 2020 06:44:06 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id p203sm6379435qke.132.2020.06.19.06.44.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 06:44:06 -0700 (PDT) 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 Message-Id: <20200619134352.297146-6-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200619134352.297146-1-adhemerval.zanella@linaro.org> References: <20200619134352.297146-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-14.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Checked on x86-64-linux-gnu, i686-linux-gnu, powerpc64le-linux-gnu, and s390x-linux-gnu. Tested-by: Carlos O'Donell Reviewed-by: Carlos O'Donell --- 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 +#include 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 . */ -#include -#include #include -#include - -/* 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 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 #include #include -#include -#include +#include 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