lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

tests: unify fortification handler logic

Browse Source 
We have multiple tests that copy & paste the same logic for disabling the
fortification output.  Let's unify this in the test-skeleton instead.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger
2013-12-29 23:13:20 +00:00
parent 10444e425e
commit c5bb8e2399
6 changed files with 58 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
debug/test-strcpy_chk.c
View File

@ -54,6 +54,10 @@ simple_strcpy_chk (char *dst, const char *src, size_t len)
#include <setjmp.h>
#include <signal.h>
static int test_main (void);
#define TEST_FUNCTION test_main ()
#include "../test-skeleton.c"
volatile int chk_fail_ok;
jmp_buf chk_fail_buf;
@ -266,28 +270,12 @@ Iteration %zd - different strings, %s (%zd, %zd, %zd)\n",
}
}
int
static int
test_main (void)
{
size_t i;
struct sigaction sa;
sa.sa_handler = handler;
sa.sa_flags = 0;
sigemptyset (&sa.sa_mask);
sigaction (SIGABRT, &sa, NULL);
/* Avoid all the buffer overflow messages on stderr. */
int fd = open (_PATH_DEVNULL, O_WRONLY);
if (fd == -1)
close (STDERR_FILENO);
else
{
dup2 (fd, STDERR_FILENO);
close (fd);
}
setenv ("LIBC_FATAL_STDERR_", "1", 1);
set_fortify_handler (handler);
test_init ();
@ -365,5 +353,3 @@ test_main (void)
do_random_tests ();
return ret;
}
#include "../test-skeleton.c"

21
debug/tst-chk1.c
View File

@ -20,7 +20,6 @@
#include <fcntl.h>
#include <locale.h>
#include <obstack.h>
#include <paths.h>
#include <setjmp.h>
#include <signal.h>
#include <stdio.h>
@ -119,23 +118,7 @@ int num2 = 987654;
static int
do_test (void)
{
struct sigaction sa;
sa.sa_handler = handler;
sa.sa_flags = 0;
sigemptyset (&sa.sa_mask);
sigaction (SIGABRT, &sa, NULL);
/* Avoid all the buffer overflow messages on stderr. */
int fd = open (_PATH_DEVNULL, O_WRONLY);
if (fd == -1)
close (STDERR_FILENO);
else
{
dup2 (fd, STDERR_FILENO);
close (fd);
}
setenv ("LIBC_FATAL_STDERR_", "1", 1);
set_fortify_handler (handler);
struct A { char buf1[9]; char buf2[1]; } a;
struct wA { wchar_t buf1[9]; wchar_t buf2[1]; } wa;
@ -1366,7 +1349,7 @@ do_test (void)
ret = 1;
}
fd = posix_openpt (O_RDWR);
int fd = posix_openpt (O_RDWR);
if (fd != -1)
{
char enough[1000];

27
debug/tst-longjmp_chk.c
View File

@ -10,6 +10,12 @@
#include <stdlib.h>
#include <unistd.h>
static int do_test(void);
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"
static jmp_buf b;
@ -48,23 +54,7 @@ handler (int sig)
static int
do_test (void)
{
struct sigaction sa;
sa.sa_handler = handler;
sa.sa_flags = 0;
sigemptyset (&sa.sa_mask);
sigaction (SIGABRT, &sa, NULL);
/* Avoid all the buffer overflow messages on stderr. */
int fd = open (_PATH_DEVNULL, O_WRONLY);
if (fd == -1)
close (STDERR_FILENO);
else
{
dup2 (fd, STDERR_FILENO);
close (fd);
}
setenv ("LIBC_FATAL_STDERR_", "1", 1);
set_fortify_handler (handler);
expected_to_fail = false;
@ -86,6 +76,3 @@ do_test (void)
puts ("second longjmp returned");
return 1;
}
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"