From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from barn.pear.relay.mailchannels.net (barn.pear.relay.mailchannels.net [23.83.216.11]) by sourceware.org (Postfix) with ESMTPS id 1D1BA3871020 for ; Fri, 30 Jun 2023 15:13:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1D1BA3871020 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gotplt.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gotplt.org 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 3DBB4881CC1; Fri, 30 Jun 2023 15:13:22 +0000 (UTC) Received: from pdx1-sub0-mail-a286.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id BEF738820D2; Fri, 30 Jun 2023 15:13:21 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1688138001; a=rsa-sha256; cv=none; b=bTlr8wGgsjtgbk0J7eK4dsLPgV1f3nAo5sNdEBeQarsUAfiwyK5DzxmiMYncWVHCqqHuUS TP6pniZ/4LKNL8/2+5lp+07lHVIsQLXYrk0GkyWM0H96s+chEvi6cYK+EvEeiCVDF4IOiB VuqJzVDqqriuPGS9I1QmOX/RBy2wGcqMA4lnkXJ6Vx1HxelqWhKh7OeeFePwVLQ95uN/qH fB83BGeHaxryEkhaR33FwGhBL4l/95mCD2PeaSGd2DQgU+MQ3P6f+6f7aQ/bgV4hxrn/qg uc3F0xku/QO755+MtmRSIlz63ryAYVQ+kvvFMfGTsCmphG8KU6amAGDG8+6yig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1688138001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=4Jk37fLQjEsIKr7gBknx5D2X21Q++O/96OjeJdBpnYk=; b=m39Gq74pgKiUZCYqKtfQRnQ08Xwb+1HleorCJMxU8g1uaDDrmLH8dfonuPE9XIRcH+bxAY F3/1FtKm6JJUm+D3mV9WrKg+7BCoi0dVUiUZai8E1Hc0egH4wMq/pIenwIfQhBRaVocLLv L/Wqth8z0MK491+eb/cy2QWSl46HLZ4++TV/fP1PUZ+CCL2/gkSQks1AycVb2oEC4uirw1 NbhHDzzREOdvWFkX4uZw04bJeoIF44G5PdXCO6ebwntYYO/BStRMxcrXCAqLMLAfrdZhWW XlFvhTKciG+8tsc/Ss89owaQ0wfS2B6wMupDVIznQeqBDzETeEuMDSAl7+gbuQ== ARC-Authentication-Results: i=1; rspamd-9fcc56855-bx8pc; auth=pass smtp.auth=dreamhost smtp.mailfrom=siddhesh@gotplt.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org X-MC-Relay: Good X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Whistle-Imminent: 4e1f25f04d7f521a_1688138002035_2304515639 X-MC-Loop-Signature: 1688138002035:2997491608 X-MC-Ingress-Time: 1688138002035 Received: from pdx1-sub0-mail-a286.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.120.163.52 (trex/6.9.1); Fri, 30 Jun 2023 15:13:22 +0000 Received: from [192.168.0.182] (bras-vprn-toroon4834w-lp130-09-174-91-45-44.dsl.bell.ca [174.91.45.44]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a286.dreamhost.com (Postfix) with ESMTPSA id 4QszNK2Mrzzn6; Fri, 30 Jun 2023 08:13:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gotplt.org; s=dreamhost; t=1688138001; bh=4Jk37fLQjEsIKr7gBknx5D2X21Q++O/96OjeJdBpnYk=; h=Date:Subject:To:From:Content-Type:Content-Transfer-Encoding; b=RQOcKD/6aMiIIqEV8WT/tkxdu/l07C+VFui98g1vfrML7ioM/wu3+jscFmWhIa0YH o+SzkHzoxgl7GWNJgZ5385a2TvERKR2921G6ZAmVoty96pITZBFYADJebFmFQMODrs LtUv0rC2cKYAckMY6eBOumVGXaiKzfLS0nZG83HXH0oHJtZJxinxy29TcSP4kfQH24 Xg1GjGvey84TIVFtFO4m9qjkBHljGvealuP2jTyyGluL/lrp5ksQrp9D1megV8lJvJ +49gmR7FyKFqkdqUwFAMQETH2xw3JSHkFK8fUuChFGReT6Mh8GDLNuV7XDRdXJgHu6 o7CBEJHsGKM8w== Message-ID: Date: Fri, 30 Jun 2023 11:13:20 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: [PATCH v3 07/16] misc/sys/cdefs.h: Create FORTIFY redirects for internal calls Content-Language: en-US To: =?UTF-8?B?RnLDqWTDqXJpYyBCw6lyYXQ=?= , libc-alpha@sourceware.org References: <20230628084246.778302-1-fberat@redhat.com> <20230628084246.778302-8-fberat@redhat.com> From: Siddhesh Poyarekar In-Reply-To: <20230628084246.778302-8-fberat@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3036.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,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 List-Id: On 2023-06-28 04:42, Frédéric Bérat wrote: > The __REDIRECT* macros are creating aliases which may lead to unwanted > PLT entries when fortification is enabled. > To prevent these entries, the REDIRECT alias should be set to point to the > existing __GI_* aliases. > This is done transparently by creating a __REDIRECT_FORTIFY* version of > these macros, that can be overwritten internally when necessary. > --- LGTM. Reviewed-by: Siddhesh Poyarekar > include/sys/cdefs.h | 14 ++++++++++++++ > misc/sys/cdefs.h | 8 ++++++++ > 2 files changed, 22 insertions(+) > > diff --git a/include/sys/cdefs.h b/include/sys/cdefs.h > index 56adb231aa..b84ad34a70 100644 > --- a/include/sys/cdefs.h > +++ b/include/sys/cdefs.h > @@ -40,6 +40,20 @@ rtld_hidden_proto (__chk_fail) > > #endif > > +#if defined SHARED > +#if IS_IN (libc) && __USE_FORTIFY_LEVEL > 0 && defined __fortify_function > + > +#undef __REDIRECT_FORTIFY > +#define __REDIRECT_FORTIFY(name, proto, alias) \ > + __REDIRECT(name, proto, __GI_##alias) > + > +#undef __REDIRECT_FORTIFY_NTH > +#define __REDIRECT_FORTIFY_NTH(name, proto, alias) \ > + __REDIRECT_NTH(name, proto, __GI_##alias) > + > +#endif > +#endif /* defined SHARED */ > + > #endif /* !defined _ISOMAC */ > > #endif > diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h > index 393d9091d9..90c21e2703 100644 > --- a/misc/sys/cdefs.h > +++ b/misc/sys/cdefs.h > @@ -268,6 +268,14 @@ > # define __ASMNAME(cname) __ASMNAME2 (__USER_LABEL_PREFIX__, cname) > # define __ASMNAME2(prefix, cname) __STRING (prefix) cname > > +#ifndef __REDIRECT_FORTIFY > +#define __REDIRECT_FORTIFY __REDIRECT > +#endif > + > +#ifndef __REDIRECT_FORTIFY_NTH > +#define __REDIRECT_FORTIFY_NTH __REDIRECT_NTH > +#endif > + > /* > #elif __SOME_OTHER_COMPILER__ >