From nobody Tue Jun 9 19:18:38 2026 X-Original-To: dev-commits-src-branches@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 4gZdxB6XmDz6gV8J for ; Tue, 09 Jun 2026 19:18:38 +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 4gZdxB5FPhz3NW7 for ; Tue, 09 Jun 2026 19:18:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781032718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Iwk0uXqvAtWcKGSiPIo/1qA6X5kTiHpUeKsUGAR4IOQ=; b=lBO0btCYGPbydO/tXbkDnJrATMaXdQ5JTgc12lDZZ3nL4rYVSeWUEpqQ3yRzg2guVXDSba TmxKgULvf1aBnpPB5TC5duhvcpxaZDF32c0ay3IeJv3AxH0FKh6MwVrKajnfkD3MuaNI01 fLo8deEiRRIHvBsexlaLCkt88jcu4dzsT3fXDLIaX6VDNrhlEiWK4YHtinebvfUg/Oot/O JMNSElpuRKeLnalchcAMpfQGUCTI5wbTUqFzJ9zxcQ11B/NG1/9t34xdjFP8W5uEpUPIPy uRxczGxUwow4vpPgUD0mRBi9TPK1Ug6oIKiVg0HvoQ8lBigIRUCt5FBbhGsPoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781032718; a=rsa-sha256; cv=none; b=RFqN2E/IuqCr/8enHTiuKBoQo9gxSI4w3VRlE91Et1QaC3z+P7rMUZi4f769h0Y6pnFlq1 xW8B3F2rmBJ2N9f+zIki5deZW/VT8u4hPfABNNiQdibUq1RlFrofcxiarb2kTZ8vrj6c8l 6M/8QTZ5773WlQwRTUdP9Pz4Mo0M6Xc9UjswkfXpmEh98+7dp/pLLLY/DX8up6+L2VcY8N E4IbewFCzzAMiAw1C/uvHLUNjkjn0xJ/H9pWD802s4ZOx1qvqfFYEswPYPgwCBWyLwp6fv ebU+WagDBJR281BEzOr0MG6w46Ihahkz/tSoK6+/55q5zNRZ0LnrRK6IMxUIDA== 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=1781032718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Iwk0uXqvAtWcKGSiPIo/1qA6X5kTiHpUeKsUGAR4IOQ=; b=LBB3PtqgQPYSkCkaN/JEPenIHfos7jvM4bvsAzYzwSp9nxkIsluM1fyz30e9JhdaMcOtEd yPwnztqM5LyfyumOPn+wNDyZH3botdhiGRM+DRKY9suV9gxBs07WAZljmdFWLNaWf+tpY6 8uEs2DqL5ylFEsdkWC6xS4mo6qtc6ZeSeZacHYBQJB7VgDRcixPYjnNfTXPA4tL6HS0BkW VTYTdAGVsN5ENkN0Iz+8jqGV6Tl9X6my2GcHbXInQAUKXJmLvKnQs6zi0JyaUXS0GlENJG AIfdwDQK/9lwMz1KhFdkAgAJd+RwhnbuUgyY/RSjOH++BI1pGQorwP860d8zmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gZdxB4Qzgznvx for ; Tue, 09 Jun 2026 19:18:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ef34 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 09 Jun 2026 19:18:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Ed Maste From: Mark Johnston Subject: git: f56e8cb94df6 - releng/14.3 - sigqueue: In capability mode, only allow signalling self List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: f56e8cb94df666e548c8e1e4e5bd74c8040817f3 Auto-Submitted: auto-generated Date: Tue, 09 Jun 2026 19:18:38 +0000 Message-Id: <6a28670e.3ef34.6a513e51@gitrepo.freebsd.org> The branch releng/14.3 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f56e8cb94df666e548c8e1e4e5bd74c8040817f3 commit f56e8cb94df666e548c8e1e4e5bd74c8040817f3 Author: Ed Maste AuthorDate: 2026-05-26 13:24:36 +0000 Commit: Mark Johnston CommitDate: 2026-06-07 17:48:17 +0000 sigqueue: In capability mode, only allow signalling self This is copied from the check in kern_kill. Approved by: so Security: FreeBSD-SA-26:28.capsicum Security: CVE-2026-45259 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) (cherry picked from commit d11ff01b3aec336128e6babbff7a421fbce82015) --- 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 3ef9d093b29e..eda533d73522 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -2041,6 +2041,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);