From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2206) id CEDA1385802F; Thu, 2 Feb 2023 14:30:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CEDA1385802F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1675348251; bh=t3cvT9jdYGsw0QDhWwEV64k9o+tdZJKp9cIz7/w3lIc=; h=From:To:Subject:Date:From; b=ioWQvtwo3vQInf/aiRgP/DV5cDnvL6wNBF7s9OwqTk1dU6Z84BHB+HOTghApsjIKk h81fOLgOWvDwMYiGfGPDDmX4Cha4Mf1yqrcvGuO7uLHceTaS3XewyYkm5j9qIXxIwS Faa+R7y1L2pRMA6KWX++zPR8/ivejZJvSB6FbRE0= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Siddhesh Poyarekar To: glibc-cvs@sourceware.org Subject: [glibc/release/2.34/master] cdefs: Limit definition of fortification macros X-Act-Checkin: glibc X-Git-Author: Siddhesh Poyarekar X-Git-Refname: refs/heads/release/2.34/master X-Git-Oldrev: 6484ae5b8c4d4314f748e4d3c9a9baa5385e57c5 X-Git-Newrev: c5c792092b57687ae3ebecbe8645fa71ddb19f8c Message-Id: <20230202143051.CEDA1385802F@sourceware.org> Date: Thu, 2 Feb 2023 14:30:51 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=c5c792092b57687ae3ebecbe8645fa71ddb19f8c commit c5c792092b57687ae3ebecbe8645fa71ddb19f8c Author: Siddhesh Poyarekar Date: Thu Feb 2 07:49:02 2023 -0500 cdefs: Limit definition of fortification macros Define the __glibc_fortify and other macros only when __FORTIFY_LEVEL > 0. This has the effect of not defining these macros on older C90 compilers that do not have support for variable length argument lists. Also trim off the trailing backslashes from the definition of __glibc_fortify and __glibc_fortify_n macros. Signed-off-by: Siddhesh Poyarekar Reviewed-by: Florian Weimer (cherry picked from commit 2337e04e21ba6040926ec871e403533f77043c40) Diff: --- misc/sys/cdefs.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h index b166f3d209..92dbd3e1fc 100644 --- a/misc/sys/cdefs.h +++ b/misc/sys/cdefs.h @@ -151,6 +151,7 @@ # define __glibc_objsize(__o) __bos (__o) #endif +#if __USE_FORTIFY_LEVEL > 0 /* Compile time conditions to choose between the regular, _chk and _chk_warn variants. These conditions should get evaluated to constant and optimized away. */ @@ -186,7 +187,7 @@ ? __ ## f ## _alias (__VA_ARGS__) \ : (__glibc_unsafe_len (__l, __s, __osz) \ ? __ ## f ## _chk_warn (__VA_ARGS__, __osz) \ - : __ ## f ## _chk (__VA_ARGS__, __osz))) \ + : __ ## f ## _chk (__VA_ARGS__, __osz))) /* Fortify function f, where object size argument passed to f is the number of elements and not total size. */ @@ -196,7 +197,8 @@ ? __ ## f ## _alias (__VA_ARGS__) \ : (__glibc_unsafe_len (__l, __s, __osz) \ ? __ ## f ## _chk_warn (__VA_ARGS__, (__osz) / (__s)) \ - : __ ## f ## _chk (__VA_ARGS__, (__osz) / (__s)))) \ + : __ ## f ## _chk (__VA_ARGS__, (__osz) / (__s)))) +#endif #if __GNUC_PREREQ (4,3) # define __warnattr(msg) __attribute__((__warning__ (msg)))