From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7933) id 1FBAD3857014; Wed, 5 Jul 2023 15:05:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1FBAD3857014 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1688569501; bh=5k+VX0vXZdQvRNErtObWYm4WoaKTC+tBy9LCdJ3dn0o=; h=From:To:Subject:Date:From; b=tBksmMEgHtW8v5X4bNPfQc7ldtmpSdoQsHE/O+UNj4NhCBVJEcVj8O2w52LEwvp11 IzRZxWDKSdA+TV8rq4CKxcaDYmri0GdVBEKfN8olR6XdP0NrgaJxw/s7aK8n0qNylV Yd+Gg/aUzEd1zJ3gpA0up7gGbnxXyHuHqMcd31fQ= MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" From: Frederic Berat To: glibc-cvs@sourceware.org Subject: [glibc] misc/sys/cdefs.h: Create FORTIFY redirects for internal calls X-Act-Checkin: glibc X-Git-Author: =?utf-8?b?RnLDqWTDqXJpYyBCw6lyYXQ=?= X-Git-Refname: refs/heads/master X-Git-Oldrev: 505c884aeb059ee7741c23d1bfc47956bd9c2a0e X-Git-Newrev: eea000f6e69a829425fae25a7c2519f5c79551de Message-Id: <20230705150501.1FBAD3857014@sourceware.org> Date: Wed, 5 Jul 2023 15:05:01 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=eea000f6e69a829425fae25a7c2519f5c79551de commit eea000f6e69a829425fae25a7c2519f5c79551de Author: Frédéric Bérat Date: Wed Apr 26 11:32:04 2023 +0200 misc/sys/cdefs.h: Create FORTIFY redirects for internal calls 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. Reviewed-by: Siddhesh Poyarekar Diff: --- 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__