From: Nisha Poyarekar <nisha.s.menon@gmail.com>
To: libc-alpha@sourceware.org
Cc: Nisha Poyarekar <nisha.s.menon@gmail.com>
Subject: [PATCH] debug: Actually run tst-longjmp_chk3.c
Date: Thu, 1 Jun 2023 17:20:42 -0400 [thread overview]
Message-ID: <20230601212042.88139-1-nisha.s.menon@gmail.com> (raw)
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 <nisha.s.menon@gmail.com>
---
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 <setjmp.h>
#include <signal.h>
+#include <stdio.h>
#include <string.h>
-static int do_test (void);
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/check.h>
+#include <support/support.h>
-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 <support/test-driver.c>
--
2.37.2
next reply other threads:[~2023-06-01 21:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-01 21:20 Nisha Poyarekar [this message]
2023-06-05 19:55 ` Adhemerval Zanella Netto
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230601212042.88139-1-nisha.s.menon@gmail.com \
--to=nisha.s.menon@gmail.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).