Module Name: src Committed By: ryo Date: Thu Apr 30 11:03:29 UTC 2020
Modified Files: src/distrib/sets/lists/debug: mi src/distrib/sets/lists/tests: mi src/tests/lib/libc/sys: Makefile Added Files: src/tests/lib/libc/sys: t_sigaltstack.c Log Message: Add a test for sigaltstack(2) and SA_ONSTACK To generate a diff of this commit: cvs rdiff -u -r1.307 -r1.308 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.838 -r1.839 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.63 -r1.64 src/tests/lib/libc/sys/Makefile cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/sys/t_sigaltstack.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.307 src/distrib/sets/lists/debug/mi:1.308 --- src/distrib/sets/lists/debug/mi:1.307 Sun Apr 26 21:05:36 2020 +++ src/distrib/sets/lists/debug/mi Thu Apr 30 11:03:29 2020 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.307 2020/04/26 21:05:36 mlelstv Exp $ +# $NetBSD: mi,v 1.308 2020/04/30 11:03:29 ryo Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile @@ -2175,6 +2175,7 @@ ./usr/libdata/debug/usr/tests/lib/libc/sys/t_setrlimit.debug tests-lib-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/lib/libc/sys/t_setuid.debug tests-lib-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/lib/libc/sys/t_sigaction.debug tests-lib-debug debug,atf,compattestfile +./usr/libdata/debug/usr/tests/lib/libc/sys/t_sigaltstack.debug tests-lib-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/lib/libc/sys/t_sigqueue.debug tests-lib-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/lib/libc/sys/t_sigtimedwait.debug tests-lib-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/lib/libc/sys/t_sigtimedwait_pr_47625.debug tests-obsolete obsolete,compattestfile Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.838 src/distrib/sets/lists/tests/mi:1.839 --- src/distrib/sets/lists/tests/mi:1.838 Wed Apr 29 23:15:22 2020 +++ src/distrib/sets/lists/tests/mi Thu Apr 30 11:03:29 2020 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.838 2020/04/29 23:15:22 rillig Exp $ +# $NetBSD: mi,v 1.839 2020/04/30 11:03:29 ryo Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -3173,6 +3173,7 @@ ./usr/tests/lib/libc/sys/t_setrlimit tests-lib-tests compattestfile,atf ./usr/tests/lib/libc/sys/t_setuid tests-lib-tests compattestfile,atf ./usr/tests/lib/libc/sys/t_sigaction tests-lib-tests compattestfile,atf +./usr/tests/lib/libc/sys/t_sigaltstack tests-lib-tests compattestfile,atf ./usr/tests/lib/libc/sys/t_sigqueue tests-lib-tests compattestfile,atf ./usr/tests/lib/libc/sys/t_sigtimedwait tests-lib-tests compattestfile,atf ./usr/tests/lib/libc/sys/t_sigtimedwait_pr_47625 tests-obsolete obsolete Index: src/tests/lib/libc/sys/Makefile diff -u src/tests/lib/libc/sys/Makefile:1.63 src/tests/lib/libc/sys/Makefile:1.64 --- src/tests/lib/libc/sys/Makefile:1.63 Sun Apr 26 18:53:33 2020 +++ src/tests/lib/libc/sys/Makefile Thu Apr 30 11:03:29 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63 2020/04/26 18:53:33 thorpej Exp $ +# $NetBSD: Makefile,v 1.64 2020/04/30 11:03:29 ryo Exp $ MKMAN= no @@ -70,6 +70,7 @@ TESTS_C+= t_sendrecv TESTS_C+= t_setrlimit TESTS_C+= t_setuid TESTS_C+= t_sigaction +TESTS_C+= t_sigaltstack TESTS_C+= t_sigqueue TESTS_C+= t_sigtimedwait TESTS_C+= t_socketpair Added files: Index: src/tests/lib/libc/sys/t_sigaltstack.c diff -u /dev/null src/tests/lib/libc/sys/t_sigaltstack.c:1.1 --- /dev/null Thu Apr 30 11:03:29 2020 +++ src/tests/lib/libc/sys/t_sigaltstack.c Thu Apr 30 11:03:29 2020 @@ -0,0 +1,100 @@ +/* $NetBSD: t_sigaltstack.c,v 1.1 2020/04/30 11:03:29 ryo Exp $ */ + +/*- + * Copyright (c) 2020 The NetBSD Foundation, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include <sys/cdefs.h> +__RCSID("$NetBSD: t_sigaltstack.c,v 1.1 2020/04/30 11:03:29 ryo Exp $"); + +#include <signal.h> +#include <stdbool.h> + +#include <atf-c.h> + +#include "h_macros.h" + +static stack_t sigstk; +static bool handler_called; +static bool handler_use_altstack; + +static void +handler(int signo __unused) +{ + char *sp = alloca(128); + + handler_called = true; + + /* checking if the stack pointer is within the range of altstack */ + if ((char *)sigstk.ss_sp <= sp && + ((char *)sigstk.ss_sp + sigstk.ss_size) > sp) + handler_use_altstack = true; + else + handler_use_altstack = false; +} + +ATF_TC(sigaltstack_onstack); +ATF_TC_HEAD(sigaltstack_onstack, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Checks for using signal stack with SA_ONSTACK"); +} + +ATF_TC_BODY(sigaltstack_onstack, tc) +{ + struct sigaction sa; + int i; + + /* set a signal handler use alternative stack */ + memset(&sigstk, 0, sizeof(sigstk)); + sigstk.ss_sp = malloc(SIGSTKSZ); + ATF_REQUIRE(sigstk.ss_sp != NULL); + sigstk.ss_size = SIGSTKSZ; + sigstk.ss_flags = 0; + ATF_REQUIRE(sigaltstack(&sigstk, 0) == 0); + + sigemptyset(&sa.sa_mask); + sa.sa_handler = handler; + sa.sa_flags = SA_ONSTACK; + sigaction(SIGUSR1, &sa, NULL); + + /* test several times */ + for (i = 1; i <= 5; i++) { + handler_called = false; + kill(getpid(), SIGUSR1); + + if (!handler_called) + atf_tc_fail("signal handler wasn't called (count=%d)", i); + if (!handler_use_altstack) + atf_tc_fail("alternative stack wasn't used (count=%d)", i); + } +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, sigaltstack_onstack); + + return atf_no_error(); +}