[PATCH] debug: Wire up tst-longjmp_chk3

[Adhemerval Zanella Netto]

On 25/11/24 15:03, Florian Weimer wrote:
> The test was added in commit ac8cc9e300a002228eb7e660df3e7b333d9a7414
> without all the required Makefile scaffolding.  Tweak the test
> so that it actually builds (including with dynamic SIGSTKSZ).
> 
> Tested on aarch64-linux-gnu, i686-linux-gnu, powerpc64le-linux-gnu,
> s390x-linux-gnu, x86-64-linux-gnu.

LGTM, thanks.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

> 
> ---
>  debug/Makefile           |  1 +
>  debug/tst-longjmp_chk3.c | 13 +++++++++----
>  2 files changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/debug/Makefile b/debug/Makefile
> index 89ee80bf4d..278e44c6ad 100644
> --- a/debug/Makefile
> +++ b/debug/Makefile
> @@ -288,6 +288,7 @@ tests = \
>    tst-fortify-wide \
>    tst-longjmp_chk \
>    tst-longjmp_chk2 \
> +  tst-longjmp_chk3 \
>    tst-realpath-chk \
>    tst-sprintf-fortify-rdonly \
>    tst-sprintf-fortify-unchecked \
> diff --git a/debug/tst-longjmp_chk3.c b/debug/tst-longjmp_chk3.c
> index 9ff9977207..7bf1646b35 100644
> --- a/debug/tst-longjmp_chk3.c
> +++ b/debug/tst-longjmp_chk3.c
> @@ -18,9 +18,12 @@
>  
>  #include <setjmp.h>
>  #include <signal.h>
> +#include <stdio.h>
>  #include <string.h>
>  
> -static char buf[SIGSTKSZ * 4];
> +#include <support/support.h>
> +
> +static char *buf;
>  static jmp_buf jb;
>  
>  static void
> @@ -49,8 +52,10 @@ do_test (void)
>    set_fortify_handler (handler);
>  
>    /* Create a valid signal stack and enable it.  */
> +  size_t bufsize = SIGSTKSZ * 4;
> +  buf = xmalloc (bufsize);
>    ss.ss_sp = buf;
> -  ss.ss_size = sizeof (buf);
> +  ss.ss_size = bufsize;
>    ss.ss_flags = 0;
>    if (sigaltstack (&ss, NULL) < 0)
>      {
> @@ -65,8 +70,8 @@ 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");
> 
> base-commit: 2062e02772128db6b90bf0078c5041c66c4a951e
>