From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from eastern.ash.relay.mailchannels.net (eastern.ash.relay.mailchannels.net [23.83.222.55]) by sourceware.org (Postfix) with ESMTPS id EDB963856241 for ; Mon, 23 May 2022 08:42:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org EDB963856241 X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 77BE51214F6; Mon, 23 May 2022 08:42:00 +0000 (UTC) Received: from pdx1-sub0-mail-a305.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id E9D36121C3E; Mon, 23 May 2022 08:41:59 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1653295320; a=rsa-sha256; cv=none; b=pBBe8Lqb8Pv2sY9AHfF71MWiRUZsUTVGBNW4Dqx/tEjDtAM0t85eyd1u2LgLFftJ6JKv2h jsLF36nZZNCHaoHiS6XMT9+0pb+Ov57zbMiEV2B/enH7EPz0HSW4PRzpPH+0cASoM3uHrc z5xyjVy1nJ9f8yhM0MIAlX8Z6uzXsW7E2M4OO0iwNbNQ34WPz7yKG6gV1iWe9zMqu1MqKk N8JIURNvOAwlTCAQS/xL0Pf8kM8KVy5ztousTuHF09B2F0Ndg7fiFcqvhX04fpmu4ywoIV J9b4juKR1LvL+fAgNqU8mDCddrDOVmHcQttrbCYuhjBixLh9oiwRybZdVFywuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1653295319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=H8zk9/9SBix2I5uyGmFeSMX8BFGYK6QYeHtgjXNRR3U=; b=i7xhzgK0nOsDuZSwO6FiHCHCVfvO7wrKzdfO9b4Wqe5t1IZM4UpfmcNW5pP2bm5fiDiMlr uj5o3gYxburvZwvfHTJ0yhma1Ayh73v0hSJ1jbOGXXwRHOR7k57NECUTcKDhbMwXLdH61Q jaGyls588mQwgR7Zskr3fMy7PXKaZao/59LbPZBN7Ap4nVqZCxVyUDF4KxvRE/Wx0if6Qg XsEJo3smcCqMxTMlWvxRhigASLRbUlRe9c3CaC7kGNewY2tPVmBDC0ij242zft6FM2SfZ7 QtBpVOG/rAJKn/LCA2iBuQI/2nsVN/eo9aJqDAXE5/HQ/zV8e8LWY9lyvBzrSw== ARC-Authentication-Results: i=1; rspamd-54dc6fd65d-xqwtm; auth=pass smtp.auth=dreamhost smtp.mailfrom=siddhesh@sourceware.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Army-Hysterical: 6c5ca88b424181d2_1653295320318_1971171080 X-MC-Loop-Signature: 1653295320317:3394761393 X-MC-Ingress-Time: 1653295320317 Received: from pdx1-sub0-mail-a305.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.112.55.220 (trex/6.7.1); Mon, 23 May 2022 08:42:00 +0000 Received: from rhbox.redhat.com (unknown [49.248.235.144]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a305.dreamhost.com (Postfix) with ESMTPSA id 4L69mk3mvgz4F; Mon, 23 May 2022 01:41:58 -0700 (PDT) From: Siddhesh Poyarekar To: libc-stable@sourceware.org Cc: Sergei Trofimovich Subject: [committed 2.34, 2.35] string.h: fix __fortified_attr_access macro call [BZ #29162] Date: Mon, 23 May 2022 14:11:52 +0530 Message-Id: <20220523084152.2265340-1-siddhesh@sourceware.org> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1171.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_NONE, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NEUTRAL, 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, 23 May 2022 08:42:06 -0000 From: Sergei Trofimovich commit e938c0274 "Don't add access size hints to fortifiable functions" converted a few '__attr_access ((...))' into '__fortified_attr_access (...)' calls. But one of conversions had double parentheses of '__fortified_attr_access (...)'. Noticed as a gnat6 build failure: /<>-glibc-2.34-210-dev/include/bits/string_fortified.h:110:50: error: macro "__fortified_attr_access" requires 3 arguments, but only 1 given The change fixes parentheses. This is seen when using compilers that do not support __builtin___stpncpy_chk, e.g. gcc older than 4.7, clang older than 2.6 or some compiler not derived from gcc or clang. Signed-off-by: Sergei Trofimovich Reviewed-by: Siddhesh Poyarekar (cherry picked from commit 5a5f94af0542f9a35aaa7992c18eb4e2403a29b9) --- string/bits/string_fortified.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/string/bits/string_fortified.h b/string/bits/string_fortified.h index 218006c9ba..4e66e0bd1e 100644 --- a/string/bits/string_fortified.h +++ b/string/bits/string_fortified.h @@ -107,7 +107,7 @@ __NTH (stpncpy (char *__dest, const char *__src, size_t __n)) # else extern char *__stpncpy_chk (char *__dest, const char *__src, size_t __n, size_t __destlen) __THROW - __fortified_attr_access ((__write_only__, 1, 3)) + __fortified_attr_access (__write_only__, 1, 3) __attr_access ((__read_only__, 2)); extern char *__REDIRECT_NTH (__stpncpy_alias, (char *__dest, const char *__src, size_t __n), stpncpy); -- 2.35.1