From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2206) id 0015B3858C60; Thu, 2 Feb 2023 13:33:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0015B3858C60 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1675344824; bh=kOtnMSJkIiPb0p4zOFsKCb0HXNftaxXju/6X/5p//Is=; h=From:To:Subject:Date:From; b=Xu3IdvVbpePVuBkyMGTETlat7dGs0NV47juRehnH+1tXjuy/jwTrQ8146IWkJrg1X YRzFwYm4jNWzLYMTXUUgnPfwFucY1SwdRZIyZ4X9FXvFK9SneNR5Ifmpy82wBgTtsM VsGpFJ+3I2X9FOEUThu8nu7S+ry88qlGIXfKjaVg= 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.37/master] cdefs: Limit definition of fortification macros X-Act-Checkin: glibc X-Git-Author: Siddhesh Poyarekar X-Git-Refname: refs/heads/release/2.37/master X-Git-Oldrev: a704fd9a133bfb10510e18702f48a6a9c88dbbd5 X-Git-Newrev: 020b43544a26237d752eae4a715c403f29226542 Message-Id: <20230202133344.0015B3858C60@sourceware.org> Date: Thu, 2 Feb 2023 13:33:43 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=020b43544a26237d752eae4a715c403f29226542 commit 020b43544a26237d752eae4a715c403f29226542 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 66d6702123..c37a3ff637 100644 --- a/misc/sys/cdefs.h +++ b/misc/sys/cdefs.h @@ -152,6 +152,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. */ @@ -187,7 +188,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. */ @@ -197,7 +198,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)))