From patchwork Thu Jun 1 21:20:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nisha Poyarekar X-Patchwork-Id: 1789350 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=uddNWiXp; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QXJwj6shPz20Tj for ; Fri, 2 Jun 2023 07:21:41 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 414233857733 for ; Thu, 1 Jun 2023 21:21:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 414233857733 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1685654498; bh=AcuyfCBYpcsNacwmFFlHLQIu+wpVWOf3X7KA9QfPml4=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=uddNWiXpg/bahe9yvCT7/zgqKcE4qasnzY6lCdB0yxb6aqyF1ZpbNgWYd1CcU2WYm jWsxpaNnFP/n8sml3EWTqNJLN/82Ml7CR8X4Z1qGEVDFcHX6tO9a11Ngt5v/fVUTty qq/cnJvWKKNy5fAGwC2DFtrr3Oaq9A+pS+VboXyY= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oi1-x235.google.com (mail-oi1-x235.google.com [IPv6:2607:f8b0:4864:20::235]) by sourceware.org (Postfix) with ESMTPS id 8F5963858404 for ; Thu, 1 Jun 2023 21:21:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8F5963858404 Received: by mail-oi1-x235.google.com with SMTP id 5614622812f47-39a55e706deso642122b6e.3 for ; Thu, 01 Jun 2023 14:21:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685654467; x=1688246467; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=AcuyfCBYpcsNacwmFFlHLQIu+wpVWOf3X7KA9QfPml4=; b=E9XSt0Jd8pALpBvqQRQBB56IVOlJlnn81KX8Md6yudV6vldcq/8zkw5GwQEssMbwt0 qGYoEhN05n2j9FxGdHl/QUkqhPSfgLDs8vELXmcKwYJx0y1wJcjjM/M1/M7GG4tx/OUv YQffNNBqbn1ijnHSQ5NdM9t0B3qaejZ/K4+VBatBezzmTrG3RTYIgrhYu0o7logLmNv8 +17LaT2xzCN8lXakPzItI4ifwgXUdZxZ3FNAtdhPYKKvyBdV2Ri5MaZYN/YHkOjgRc+H uaFbuJFArnVFwgCCyf9VbB+OezvMeYUiHGzQLpkRA88y6kNVfIFpozlmlr8jC9qj7yTO SvGQ== X-Gm-Message-State: AC+VfDzGLvXwBzSdxWIBnzxt3AEwQNUfwcnXI28f86W6RlLIv8KRi1si PzcF5CN79VtyTuxqWK4vzCHTCq9TXbM= X-Google-Smtp-Source: ACHHUZ6lnaxuABXVJm9Z2VGpKY6TlFi0ywU6nwxW82A1oQoPDV6mOI440cN88Vwj3+L2dBXerNrRzA== X-Received: by 2002:a05:6808:245:b0:398:4d53:48e5 with SMTP id m5-20020a056808024500b003984d5348e5mr337041oie.47.1685654467356; Thu, 01 Jun 2023 14:21:07 -0700 (PDT) Received: from Nisha-ThinkPad.. (bras-vprn-toroon4834w-lp130-02-142-113-138-85.dsl.bell.ca. [142.113.138.85]) by smtp.gmail.com with ESMTPSA id r6-20020ac85e86000000b003f018e18c35sm8077147qtx.27.2023.06.01.14.21.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jun 2023 14:21:06 -0700 (PDT) To: libc-alpha@sourceware.org Cc: Nisha Poyarekar Subject: [PATCH] debug: Actually run tst-longjmp_chk3.c Date: Thu, 1 Jun 2023 17:20:42 -0400 Message-Id: <20230601212042.88139-1-nisha.s.menon@gmail.com> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Nisha Poyarekar via Libc-alpha From: Nisha Poyarekar Reply-To: Nisha Poyarekar Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" tst-longjmp_c.c test was not run at all because there was no entry for it in the Makefile. With this change, I have also included the new test-driver.c instead of test-skeleton.c. Signed-off-by: Nisha Poyarekar --- debug/Makefile | 1 + debug/tst-longjmp_chk3.c | 30 +++++++++++++----------------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/debug/Makefile b/debug/Makefile index 096df27aeb..e19aa1107a 100644 --- a/debug/Makefile +++ b/debug/Makefile @@ -279,6 +279,7 @@ tests = \ tst-backtrace6 \ tst-longjmp_chk \ tst-longjmp_chk2 \ + tst-longjmp_chk3 \ tst-realpath-chk \ tst-sprintf-fortify-unchecked \ # tests diff --git a/debug/tst-longjmp_chk3.c b/debug/tst-longjmp_chk3.c index f1e576ad5b..ea0e67d2a6 100644 --- a/debug/tst-longjmp_chk3.c +++ b/debug/tst-longjmp_chk3.c @@ -18,13 +18,12 @@ #include #include +#include #include -static int do_test (void); -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" +#include +#include -static char buf[SIGSTKSZ * 4]; static jmp_buf jb; static void @@ -49,18 +48,17 @@ static int do_test (void) { stack_t ss; + size_t bufsize = SIGSTKSZ * 4; + void *buf = xmalloc (bufsize); set_fortify_handler (handler); /* Create a valid signal stack and enable it. */ ss.ss_sp = buf; - ss.ss_size = sizeof (buf); + ss.ss_size = bufsize; ss.ss_flags = 0; if (sigaltstack (&ss, NULL) < 0) - { - printf ("first sigaltstack failed: %m\n"); - return 1; - } + FAIL_RET ("first sigaltstack failed: %m\n"); /* Trigger the signal handler which will create a jmpbuf that points to the end of the signal stack. */ @@ -69,17 +67,15 @@ do_test (void) /* Shrink the signal stack so the jmpbuf is now invalid. We adjust the start & end to handle stacks that grow up & down. */ - ss.ss_sp = buf + sizeof (buf) / 2; - ss.ss_size = sizeof (buf) / 4; + ss.ss_sp = buf + bufsize / 2; + ss.ss_size = bufsize / 4; if (sigaltstack (&ss, NULL) < 0) - { - printf ("second sigaltstack failed: %m\n"); - return 1; - } + FAIL_RET ("second sigaltstack failed: %m\n"); /* This should fail. */ longjmp (jb, 1); - puts ("longjmp returned and shouldn't"); - return 1; + FAIL_RET ("longjmp returned and shouldn't"); } + +#include