From nobody Tue May 26 19:19:06 2026 X-Original-To: dev-commits-src-main@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 4gQ2cB6vBCz6gKLV for ; Tue, 26 May 2026 19:19:06 +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 4gQ2cB40WGz3YlG for ; Tue, 26 May 2026 19:19:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779823146; 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=3I0oEor6UbiymaFBrvscJeACuyOex3PhUjKwmGqtxR8=; b=T6aVJKASwMjZcps1prgZcDjHJlDGFIK18kh2zqFjIKxU9Hl77vBSXZczk68EphG+9fyHTm wLW64LHc4eca2f80G5Tl06th4ZJCiJuBWGF0wHzTmdv8gafFukvd9izclyaZ2jxhnIFVQZ OxCZxRr2JP02CUFsHwpsoG6d8WGGaoIzocGUgVN5oINWqKqmWUkNFbVe7bDvMeO9EBRkM3 5fAtDEHoM+s1uhGozNZLAQ1hfP0WKVQH6Tk/ylgYMCikzTlHaGkOOOMKwtYMQqq5ZuOlkR v0yoCfLhjGmpxlAk/2QrVhSqc6LcfhKRcSE8w3z+u2XzCsiwzwLaRvoCHugNHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779823146; a=rsa-sha256; cv=none; b=FCkaSY5bylCt7XvknwtxrIIas8Zb4gQ9fISIgopX+tIYKwKQotHUQV0Z982VukZIzTfFpB TgE4+OR7gPnGFK5oRt4QPSMPlpAvrLpZtlZL3FFbc/E1NaLq4g7vSMbo65RZNDsjiepr0g JXAKHVNyJhubSuMr5ziNTRkoEVb5n6H/uCR3tePyxIiAuO4CJSrLmGF1sontZXVY6dU937 m2P4+/ixyxWRVz77TUBVakZyJVzlvnEKDo3z0pHGCfzYtw5BtIWL/8w8MZ3q+k7y2Lg8Em hBtUuRAHJxC1Dr/MRGg9tmy39D4VXqSHLUI6+blz7rnKhft8v8EAbXX2YtMAng== 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=1779823146; 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=3I0oEor6UbiymaFBrvscJeACuyOex3PhUjKwmGqtxR8=; b=Q5uF2FmylyqeUBqFt2YOGYRmir/rGXp2Kz2qRJeCewYLqLda98cH2lBhGvyQVhSd6nB3A0 Y3tkQgTqXnUvi+rxcgAyAH4NKvu8CWaeDwEz/koBjWFmYIxSku0m9qWd1Fj5E9hXPgYr8G /fIsEIRu4WsG2yg+bpo5BwJF7O2gkhcBQyMLGjB18EiDoCF0m/+hwLCMgJOkHDBy5wUu/I j/7aVkHTxwenCV6Oz7eKGtq2n6qhnDSUM1Xumy6LeEq+o9w/p5r2e8NdfSoeYhF7nmLtwq LLmipbfmnRNh7ZQONhzPdBrAd31AGNHsRvk9rPI9+VMpFvq4C5FWHCwZ+xWu9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gQ2cB3btNz8sM for ; Tue, 26 May 2026 19:19:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45a03 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 26 May 2026 19:19:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: b9d16b7fd2fa - main - sigqueue: In capability mode, only allow signalling self List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b9d16b7fd2fa6bc4b3e8364804cbdc1b76ebe8a5 Auto-Submitted: auto-generated Date: Tue, 26 May 2026 19:19:06 +0000 Message-Id: <6a15f22a.45a03.9367978@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b9d16b7fd2fa6bc4b3e8364804cbdc1b76ebe8a5 commit b9d16b7fd2fa6bc4b3e8364804cbdc1b76ebe8a5 Author: Ed Maste AuthorDate: 2026-05-26 13:24:36 +0000 Commit: Ed Maste CommitDate: 2026-05-26 19:18:56 +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 --- sys/kern/kern_sig.c | 10 ++++++++++ tests/sys/capsicum/capmode.cc | 12 +++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 9be7c82ee98b..e48997ed966a 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -2038,6 +2038,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); diff --git a/tests/sys/capsicum/capmode.cc b/tests/sys/capsicum/capmode.cc index c6eef19b350f..fdc572f11b5b 100644 --- a/tests/sys/capsicum/capmode.cc +++ b/tests/sys/capsicum/capmode.cc @@ -703,8 +703,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(); @@ -722,7 +722,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); }