From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 3E8983858D39; Fri, 29 Dec 2023 14:36:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3E8983858D39 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1703860594; bh=57ixI/LW110E/3wcl473N0Jx5rJAOBEuSP+29w4X0xo=; h=From:To:Subject:Date:From; b=LKba1a+Br0HvOrwsfTwMeK29zaTxadrxCeMo29/0rvK6DqOHxuTrZP1hepmYyJNoH Ja7PUqEyTyKjc0p8TVRRMfzUA+7yVpE8kqNXrjgQkoGF8VyA2eAxfned8/CIRlBTIs sLQ+jZKBzuGpyJzL6hctA+kUNMq8hLfat9oFF0gQ= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] debug: Increase tst-fortify checks for compiler without __va_arg_pack support X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/master X-Git-Oldrev: 9556acd249687ac562deb6309503165d66eb06fa X-Git-Newrev: bf320000b47ce46aa6dbe1b7068e6539bf2df9bb Message-Id: <20231229143634.3E8983858D39@sourceware.org> Date: Fri, 29 Dec 2023 14:36:34 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=bf320000b47ce46aa6dbe1b7068e6539bf2df9bb commit bf320000b47ce46aa6dbe1b7068e6539bf2df9bb Author: Adhemerval Zanella Date: Thu Dec 21 15:59:16 2023 -0300 debug: Increase tst-fortify checks for compiler without __va_arg_pack support The fortify wrappers for varargs functions already add fallbacks to builtins calls if __va_arg_pack is not supported. Checked on aarch64, armhf, x86_64, and i686. Reviewed-by: Siddhesh Poyarekar Diff: --- debug/tst-fortify.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/debug/tst-fortify.c b/debug/tst-fortify.c index 20e926751a..5cd9d22feb 100644 --- a/debug/tst-fortify.c +++ b/debug/tst-fortify.c @@ -130,7 +130,7 @@ static int num2 = 987654; chk_fail_ok = 0; \ FAIL (); \ } -#if __USE_FORTIFY_LEVEL >= 2 && (!defined __cplusplus || defined __va_arg_pack) +#if __USE_FORTIFY_LEVEL >= 2 # define CHK_FAIL2_START CHK_FAIL_START # define CHK_FAIL2_END CHK_FAIL_END #else @@ -419,7 +419,6 @@ do_test (void) stpncpy (buf + 6, "cd", l0 + 5); CHK_FAIL_END -# if !defined __cplusplus || defined __va_arg_pack CHK_FAIL_START sprintf (buf + 8, "%d", num1); CHK_FAIL_END @@ -439,7 +438,6 @@ do_test (void) CHK_FAIL_START swprintf (wbuf + 8, l0 + 3, L"%d", num1); CHK_FAIL_END -# endif memcpy (buf, str1 + 2, 9); CHK_FAIL_START @@ -550,7 +548,6 @@ do_test (void) FAIL (); } -# if !defined __cplusplus || defined __va_arg_pack CHK_FAIL_START sprintf (a.buf1 + (O + 7), "%d", num1); CHK_FAIL_END @@ -562,7 +559,6 @@ do_test (void) CHK_FAIL_START snprintf (a.buf1 + (O + 7), l0 + 3, "%d", num2); CHK_FAIL_END -# endif memcpy (a.buf1, str1 + (3 - O), 8 + O); CHK_FAIL_START