From nobody Fri May 29 19:11:40 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 4gRtJF1RYKz6fys5 for ; Fri, 29 May 2026 19:11:41 +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 4gRtJF0dcJz3s5B for ; Fri, 29 May 2026 19:11:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780081901; 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=E00/wWucdJ9vSR6yVa0vzjyO19qyNEGdJCrQPiSDbMg=; b=nzjNQhEMUgHOrZc9cu6PXNV3Clce772Ycr+FBV6PE/xZevRjEBK91eJgGlXrgLzMfDTvgD rZv3x1MyE6p7la9U+zgZ3PUGDYzEV9+jjpnMqvpGKr3RyhTj8dVUvgOIUgT/wqUo+kBf1N TwM1Jn/2QjrAv9p1B9zYC7dy/cqNp6fU7UA3xfTs9DIY3/WB1+0//XhXkkkjS33Ar6rZ/8 qw03xumFKZbAEtE+juTcWA41hQJigFMl0cgg76M7pdgKUH1XmPSQWeMFfWoIcL4OAbDO5/ 1W2K6NwTJgbOF/VqCG5/tNY+DA9SyCeax9DGrkAUjIx08zaMZOXFzcd3NBHm9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780081901; a=rsa-sha256; cv=none; b=Kl1yKBV43lA2vAu7xfThzavpyXm5LhatnjxVsLHL48AebMP+G/j1CAwrLj2uMZqIMtqdpA vyJNenSqXoxO1qQ36/k0Sc6YPeuf50iahKKK9cdL6SL+ueWies7v+kcSw+Sbscd+F2Bwnn i1vnn9EZbsrfCcvqiXiihsNRzHnBx0wd3UP37J9ufF9Qx9KXZV+R7xVkYVH4RY9FIKrzCv PQf28YK3lUUdEYjC3PRl0RFzjMRf7TJRP+goCOMYsIFR91IM3qiUz5sbhDRRKFUBAw02Eg U0rxHvHOwkpoun47bshtE0mGJodlxZqLEHfN1l4pH5r5u1eHrW+R4JmaSFMSjw== 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=1780081901; 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=E00/wWucdJ9vSR6yVa0vzjyO19qyNEGdJCrQPiSDbMg=; b=iuxr1znb8BaoJxElnPZ+EXZW/+I3yNBPJ1fBz9v97emq8NCni5R9bczVQ+5gNYGlbGBjrE c5qNnqWcHv7XVy33BNXqwx+vQCKK8EGNchAEf7BydPhMEzSxndF7311yY3YbZ5KQd0r8Rq EawIayrS/boCyGumd82AfEIR9xsPWGyAb41Glxs56vYS4HrkC9DOkvJCL4O9MQiAqOXC+2 alcoRmCGEc4xEQt5mYGvtDP6F7N9fW0dSXI0qLG7CH9VLQGBI6vBV3jut/cuMePjAfFjFU pQeO5Svuj3SUOr08gNZb5y/eLG7u6/qjmA40fDlPh5hygRrdLRXChbUIWIhH9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gRtJF05mwzmmj for ; Fri, 29 May 2026 19:11:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 227b7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 29 May 2026 19:11:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: defd9b86ef99 - stable/15 - 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: defd9b86ef995ce70363eae9b323d616bda865be Auto-Submitted: auto-generated Date: Fri, 29 May 2026 19:11:40 +0000 Message-Id: <6a19e4ec.227b7.39e774ed@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=defd9b86ef995ce70363eae9b323d616bda865be commit defd9b86ef995ce70363eae9b323d616bda865be Author: Ed Maste AuthorDate: 2026-05-26 13:24:36 +0000 Commit: Ed Maste CommitDate: 2026-05-29 19:11:28 +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) --- 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 5ff025290211..d2eb1e8633a8 100644 --- a/tests/sys/capsicum/capmode.cc +++ b/tests/sys/capsicum/capmode.cc @@ -746,8 +746,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(); @@ -765,7 +765,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); }