From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from hall.aurel32.net (hall.aurel32.net [IPv6:2001:bc8:30d7:100::1]) by sourceware.org (Postfix) with ESMTPS id 5412A3858018; Mon, 15 Aug 2022 21:13:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5412A3858018 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=aurel32.net Authentication-Results: sourceware.org; spf=none smtp.mailfrom=aurel32.net DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=aurel32.net ; s=202004.hall; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Content-Type:From:Reply-To: Subject:Content-ID:Content-Description:X-Debbugs-Cc; bh=WZMkH4fXSQJyzD1YferTyG1sTpy23nLEXDyZGs3P+F8=; b=KoSkqFjMKK6wfxFJ1p28chT6gn vxFZ70S2cphu+Oy+z81VV5tucUUE5cgBYlKJf1k0NIi1Ql0GfttmqIUpEYw8zdW2LFvG1fppb3X6i z576zu7AiBN57sdR0ItsSWbRAPUekm6hvEKA5fQocMoRYmcWYONKxLqmdyxNNNbZ3g/bhuKyEs0ta 3FQIiGVyH4fRfEL3Vj5Ztor/qHu70L9sAPKOvaOcB1tfM6GrLuZM/ZrJpKOhRMB++nNo+ZRNYws2z xkW0CFrlS1Ui2+pPtggEblyHYZHCJH5f2yJYKk03vk+WXm2I9eRVixsjUMWQbZD2d2+cXWdAeXe1V M4Tni70w==; Received: from [2a01:e0a:406:7381:12d4:684f:f4be:978c] (helo=ohm.aurel32.net) by hall.aurel32.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oNhPD-008lEo-S2; Mon, 15 Aug 2022 23:13:51 +0200 Received: from aurel32 by ohm.aurel32.net with local (Exim 4.96) (envelope-from ) id 1oNhP7-009ndu-2Q; Mon, 15 Aug 2022 23:13:45 +0200 From: Aurelien Jarno To: libc-stable@sourceware.org Cc: Noah Goldstein , Siddhesh Poyarekar Subject: [COMMITTED 2.35 2/2] stdlib: Fixup mbstowcs NULL __dst handling. [BZ #29279] Date: Mon, 15 Aug 2022 23:13:37 +0200 Message-Id: <20220815211337.2335726-2-aurelien@aurel32.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220815211337.2335726-1-aurelien@aurel32.net> References: <20220815211337.2335726-1-aurelien@aurel32.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_PASS, 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 X-BeenThere: libc-stable@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-stable mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Aug 2022 21:13:55 -0000 From: Noah Goldstein commit 464d189b9622932a75302290625de84931656ec0 (origin/master, origin/HEAD) Author: Noah Goldstein 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`. Reviewed-by: Siddhesh Poyarekar (cherry picked from commit 220b83d83d32aa9e6f5659e2fa2a63a0024c3e4a) --- stdlib/bits/stdlib.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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); -- 2.35.1