From nobody Fri May 29 19:12:58 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gRtKq4ZxBz6fysB for ; Fri, 29 May 2026 19:13:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gRtKq45jhz3sY2 for ; Fri, 29 May 2026 19:13:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780081983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1wO/zpmCOv6GBrswedqeIcS3uZ4889aeJcwh4/3rzUM=; b=LtSmiF9I1gK8xCp+xHBU/2ELCYIXzI0k39M9UBZhPHe+m3ltjO6pk0RO/TxUlrFuIuO6Jb /PFvtqTvGf5te4pYcqf3LdwMEmT7pJVooOANiQQRJEVXlxmKy0jwahevQ/F3HqIvRNg7wa c23/Jhr3fTVsFejsbK/JSiSRpwvQMDoY207ata8Ryv4uYI+wcQpnLZVa8XCFEx66cg4PTu kiCYPhXHwnj8cdAW80c/Rbz48jALxf2EuZ7od+MVxNYf0iBUtJNR+EgOaloaF2jRlHmwHo Ks0sp+yFQr27L1oL0LGZmVfFmkaZnft/Z48I1848DkXvidw3MeIHNJQRowOG9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780081983; a=rsa-sha256; cv=none; b=BbEOD31lM2/HhhbJgeuJePznYIzSbdY+9WT7h5DyZfiSxDaWSll56bcw/OK21m/2+5zyFt D9t8259pdFd5iCDxA3KP8iuMIbLSP3XK6i/cH1uC7ny77NE9xdSx49qB89jV7pIWIlkYEn bN0a2V8c4krOHwm7+qsK/ZSxzSL4MJNH9wt3r+IKr2ldR4o1JAl20PXYQhcKltq9jMTZkb fmIO6LkS1dlC+vfNlW2TplsEofP1o7lNYtRMPQByCbVKKtxDVh/5i+Z1FLUYTjEJR7gtgQ MFqmXo7RVP2zLhBmXhOr86XkjUrwIGFQ4cCZHn4EUfnPhjQtf7PYvom4855A7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780081983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1wO/zpmCOv6GBrswedqeIcS3uZ4889aeJcwh4/3rzUM=; b=qxkWg6NcCgyFULXXurfBUo2/1nVsyRntZBkEOWv/o4T1AE2DQdUOc43R5hQ4Ho6LzsXL8T 9ts3DSoGEADGaQZH7dRKyunpBPpVjCSqeGZxmzhAPBbYb9GFyaWbxFlPmg0su3ukIZm3g8 uX/g/EbCeqZoI543XLeUgsDpOWK9x3+PNYAINd/qXOwhjf2soJg4WYqe3k5I0Okf+HrI8o wj5nZDKAOY3j+Sqat5mQ/KsJYDT4aEZKTgFe+OJaOHVTg1kR8doW+fe4XtDrahSlLVNZLE +g2Y284uAKNFAISC90YA8H6uA8DEUxRzedts2NvU+bg10kwfz+acLADmMvYpwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gRtKq3JhFzmXw for ; Fri, 29 May 2026 19:13:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22b87 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 29 May 2026 19:12:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: d11ff01b3aec - stable/14 - sigqueue: In capability mode, only allow signalling self List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d11ff01b3aec336128e6babbff7a421fbce82015 Auto-Submitted: auto-generated Date: Fri, 29 May 2026 19:12:58 +0000 Message-Id: <6a19e53a.22b87.5077d08c@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d11ff01b3aec336128e6babbff7a421fbce82015 commit d11ff01b3aec336128e6babbff7a421fbce82015 Author: Ed Maste AuthorDate: 2026-05-26 13:24:36 +0000 Commit: Ed Maste CommitDate: 2026-05-29 19:12:46 +0000 sigqueue: In capability mode, only allow signalling self This is copied from the check in kern_kill. Reviewed by: markj, oshogbo Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57244 (cherry picked from commit b9d16b7fd2fa6bc4b3e8364804cbdc1b76ebe8a5) (cherry picked from commit defd9b86ef995ce70363eae9b323d616bda865be) --- contrib/capsicum-test/capmode.cc | 12 +++++++++--- sys/kern/kern_sig.c | 10 ++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/contrib/capsicum-test/capmode.cc b/contrib/capsicum-test/capmode.cc index f32d9e038744..12921bb53c72 100644 --- a/contrib/capsicum-test/capmode.cc +++ b/contrib/capsicum-test/capmode.cc @@ -747,8 +747,8 @@ FORK_TEST(Capmode, NewThread) { close(thread_pipe[1]); } -static volatile sig_atomic_t had_signal = 0; -static void handle_signal(int) { had_signal = 1; } +static volatile sig_atomic_t signal_cnt = 0; +static void handle_signal(int) { signal_cnt++; } FORK_TEST(Capmode, SelfKill) { pid_t me = getpid(); @@ -766,7 +766,13 @@ FORK_TEST(Capmode, SelfKill) { // Can only kill(2) to own pid. EXPECT_CAPMODE(kill(child, SIGUSR1)); EXPECT_OK(kill(me, SIGUSR1)); - EXPECT_EQ(1, had_signal); + EXPECT_EQ(1, signal_cnt); + + union sigval sv; + sv.sival_int = 0x1234; + EXPECT_CAPMODE(sigqueue(child, SIGUSR1, sv)); + EXPECT_OK(sigqueue(me, SIGUSR1, sv)); + EXPECT_EQ(2, signal_cnt); signal(SIGUSR1, original); } diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 91361d680809..7f399586f639 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -2047,6 +2047,16 @@ kern_sigqueue(struct thread *td, pid_t pid, int signumf, union sigval *value) if (pid <= 0) return (EINVAL); + /* + * A process in capability mode can send signals only to itself. + */ + if (pid != td->td_proc->p_pid) { + if (CAP_TRACING(td)) + ktrcapfail(CAPFAIL_SIGNAL, &signum); + if (IN_CAPABILITY_MODE(td)) + return (ECAPMODE); + } + if ((signumf & __SIGQUEUE_TID) == 0) { if ((p = pfind_any(pid)) == NULL) return (ESRCH);