From owner-svn-src-head@freebsd.org Fri Nov 30 22:44:35 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 45D0611524C3;
Fri, 30 Nov 2018 22:44:35 +0000 (UTC)
(envelope-from vangyzen@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id D6EA57B337;
Fri, 30 Nov 2018 22:44:34 +0000 (UTC)
(envelope-from vangyzen@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A96B17136;
Fri, 30 Nov 2018 22:44:34 +0000 (UTC)
(envelope-from vangyzen@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAUMiYMQ083113;
Fri, 30 Nov 2018 22:44:34 GMT (envelope-from vangyzen@FreeBSD.org)
Received: (from vangyzen@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAUMiXxl083108;
Fri, 30 Nov 2018 22:44:33 GMT (envelope-from vangyzen@FreeBSD.org)
Message-Id: <201811302244.wAUMiXxl083108@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: vangyzen set sender to
vangyzen@FreeBSD.org using -f
From: Eric van Gyzen <vangyzen@FreeBSD.org>
Date: Fri, 30 Nov 2018 22:44:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r341353 - in head: sys/arm/arm sys/arm64/arm64
sys/riscv/riscv tests/sys/kern
X-SVN-Group: head
X-SVN-Commit-Author: vangyzen
X-SVN-Commit-Paths: in head: sys/arm/arm sys/arm64/arm64 sys/riscv/riscv
tests/sys/kern
X-SVN-Commit-Revision: 341353
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: D6EA57B337
X-Spamd-Result: default: False [0.47 / 15.00];
local_wl_from(0.00)[FreeBSD.org];
NEURAL_SPAM_MEDIUM(0.15)[0.151,0];
NEURAL_HAM_SHORT(-0.02)[-0.021,0];
NEURAL_SPAM_LONG(0.34)[0.335,0];
ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]
X-Rspamd-Server: mx1.freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
<svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Nov 2018 22:44:35 -0000
Author: vangyzen
Date: Fri Nov 30 22:44:33 2018
New Revision: 341353
URL: https://svnweb.freebsd.org/changeset/base/341353
Log:
Fix reporting of SS_ONSTACK
Fix reporting of SS_ONSTACK in nested signal delivery when sigaltstack()
is used on some architectures.
Add a unit test for this. I tested the test by introducing the bug
on amd64. I did not test it on other architectures.
Reviewed by: kib
MFC after: 2 weeks
Sponsored by: Dell EMC Isilon
Differential Revision: https://reviews.freebsd.org/D18347
Added:
head/tests/sys/kern/sigaltstack.c (contents, props changed)
Modified:
head/sys/arm/arm/machdep.c
head/sys/arm64/arm64/machdep.c
head/sys/riscv/riscv/machdep.c
head/tests/sys/kern/Makefile
Modified: head/sys/arm/arm/machdep.c
==============================================================================
--- head/sys/arm/arm/machdep.c Fri Nov 30 21:57:02 2018 (r341352)
+++ head/sys/arm/arm/machdep.c Fri Nov 30 22:44:33 2018 (r341353)
@@ -653,9 +653,9 @@ sendsig(catcher, ksi, mask)
#endif
frame.sf_si = ksi->ksi_info;
frame.sf_uc.uc_sigmask = *mask;
- frame.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK )
- ? ((onstack) ? SS_ONSTACK : 0) : SS_DISABLE;
frame.sf_uc.uc_stack = td->td_sigstk;
+ frame.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK) != 0 ?
+ (onstack ? SS_ONSTACK : 0) : SS_DISABLE;
mtx_unlock(&psp->ps_mtx);
PROC_UNLOCK(td->td_proc);
Modified: head/sys/arm64/arm64/machdep.c
==============================================================================
--- head/sys/arm64/arm64/machdep.c Fri Nov 30 21:57:02 2018 (r341352)
+++ head/sys/arm64/arm64/machdep.c Fri Nov 30 22:44:33 2018 (r341353)
@@ -661,9 +661,9 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask
get_fpcontext(td, &frame.sf_uc.uc_mcontext);
frame.sf_si = ksi->ksi_info;
frame.sf_uc.uc_sigmask = *mask;
- frame.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK) ?
- ((onstack) ? SS_ONSTACK : 0) : SS_DISABLE;
frame.sf_uc.uc_stack = td->td_sigstk;
+ frame.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK) != 0 ?
+ (onstack ? SS_ONSTACK : 0) : SS_DISABLE;
mtx_unlock(&psp->ps_mtx);
PROC_UNLOCK(td->td_proc);
Modified: head/sys/riscv/riscv/machdep.c
==============================================================================
--- head/sys/riscv/riscv/machdep.c Fri Nov 30 21:57:02 2018 (r341352)
+++ head/sys/riscv/riscv/machdep.c Fri Nov 30 22:44:33 2018 (r341353)
@@ -587,9 +587,9 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask
get_fpcontext(td, &frame.sf_uc.uc_mcontext);
frame.sf_si = ksi->ksi_info;
frame.sf_uc.uc_sigmask = *mask;
- frame.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK) ?
- ((onstack) ? SS_ONSTACK : 0) : SS_DISABLE;
frame.sf_uc.uc_stack = td->td_sigstk;
+ frame.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK) != 0 ?
+ (onstack ? SS_ONSTACK : 0) : SS_DISABLE;
mtx_unlock(&psp->ps_mtx);
PROC_UNLOCK(td->td_proc);
Modified: head/tests/sys/kern/Makefile
==============================================================================
--- head/tests/sys/kern/Makefile Fri Nov 30 21:57:02 2018 (r341352)
+++ head/tests/sys/kern/Makefile Fri Nov 30 22:44:33 2018 (r341353)
@@ -10,6 +10,7 @@ ATF_TESTS_C+= kern_descrip_test
ATF_TESTS_C+= ptrace_test
TEST_METADATA.ptrace_test+= timeout="15"
ATF_TESTS_C+= reaper
+ATF_TESTS_C+= sigaltstack
PLAIN_TESTS_C+= subr_unit_test
ATF_TESTS_C+= sys_getrandom
ATF_TESTS_C+= unix_passfd_test
Added: head/tests/sys/kern/sigaltstack.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tests/sys/kern/sigaltstack.c Fri Nov 30 22:44:33 2018 (r341353)
@@ -0,0 +1,115 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2018 Eric van Gyzen
+ *
+ * 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 AUTHOR 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 AUTHOR 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>
+__FBSDID("$FreeBSD$");
+
+#include <atf-c.h>
+#include <errno.h>
+#include <signal.h>
+#include <stdbool.h>
+#include <stdlib.h>
+
+/*
+ * TODO add tests for:
+ *
+ * - all error cases
+ * - SS_DISABLE
+ * - no effect without SA_ONSTACK
+ */
+
+static sig_atomic_t disabled_correct = 1;
+static sig_atomic_t level1_correct = -1;
+static sig_atomic_t level2_correct = -1;
+
+static void
+sig_handler(int signo, siginfo_t *info __unused, void *ucp)
+{
+ ucontext_t *uc = ucp;
+
+ // The alternate signal stack is enabled.
+ disabled_correct = disabled_correct &&
+ (uc->uc_stack.ss_flags & SS_DISABLE) == 0;
+ if (signo == SIGUSR1) {
+ // The thread was NOT running on the alternate signal
+ // stack when this signal arrived.
+ level1_correct = (uc->uc_stack.ss_flags & SS_ONSTACK) == 0;
+ raise(SIGUSR2);
+ } else {
+ // The thread WAS running on the alternate signal
+ // stack when this signal arrived.
+ level2_correct = (uc->uc_stack.ss_flags & SS_ONSTACK) != 0;
+ }
+}
+
+ATF_TC(ss_onstack);
+
+ATF_TC_HEAD(ss_onstack, tc)
+{
+
+ atf_tc_set_md_var(tc, "descr", "Test reporting of SS_ONSTACK");
+}
+
+ATF_TC_BODY(ss_onstack, tc)
+{
+ stack_t ss = {
+ .ss_size = SIGSTKSZ,
+ };
+ stack_t oss = {0};
+
+ ss.ss_sp = malloc(ss.ss_size);
+ ATF_REQUIRE(ss.ss_sp != NULL);
+ ATF_REQUIRE(sigaltstack(&ss, &oss) == 0);
+
+ // There should be no signal stack currently configured.
+ ATF_CHECK(oss.ss_sp == NULL);
+ ATF_CHECK(oss.ss_size == 0);
+ ATF_CHECK((oss.ss_flags & SS_DISABLE) != 0);
+ ATF_CHECK((oss.ss_flags & SS_ONSTACK) == 0);
+
+ struct sigaction sa = {
+ .sa_sigaction = sig_handler,
+ .sa_flags = SA_ONSTACK | SA_SIGINFO,
+ };
+ ATF_REQUIRE(sigemptyset(&sa.sa_mask) == 0);
+ ATF_REQUIRE(sigaction(SIGUSR1, &sa, NULL) == 0);
+ ATF_REQUIRE(sigaction(SIGUSR2, &sa, NULL) == 0);
+ ATF_REQUIRE(raise(SIGUSR1) == 0);
+
+ ATF_CHECK(level1_correct != -1);
+ ATF_CHECK(level1_correct == 1);
+ ATF_CHECK(level2_correct != -1);
+ ATF_CHECK(level2_correct == 1);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+ ATF_TP_ADD_TC(tp, ss_onstack);
+
+ return (atf_no_error());
+}