From nobody Tue Nov 17 17:06:23 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 4jTWNJ2CZgz71S8F for ; Tue, 17 Nov 2026 17:06:24 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jTWNH5lMJz4Jn0 for ; Tue, 17 Nov 2026 17:06:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935183; 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=k+QDp07SaRVq3QAaDdnQeMCP3dKhytSM6jiwmemd0Hc=; b=KnvSH76z37YRkVA5xDmZbZxHnpovn4YGVNBCs0IHr0r7ZGGj9Frn11JGUtl4TTb5ZnZHpN cAy4bGLsVJMXOcUNOpea/scud6UsEMczd/qB4XCC8gMrKwmPiSvJoVc7oAo3LUJg5IVAxr jiiEoDW18SchYT3s/YzgXEdD8cHY/12roGKhpCnpujwph8p2KsSDW6euA2RJSELtwLXH1+ As3VuWlf0xu369cIbdGHXrbnAO7ZFmswEoXZ9iyIpBGsog96Lc3bqnmg7v9by+lKXOBZsJ 11u+KcyErLR8O2KQB8MFYbjJ3ik3UL0hqMZiEs+aYoAAsptU8uH6Z/7qzixTtA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935183; b=dGIrk63hOXO/4QbD3o1CoQB/RaxWtJWa970WlA3AvLddAq+YDuDCI/91H1Qg4mYm5c9Xve P/z8dKjnBpPz0EOUnvIytF7gpEhPFia9pnsf6YiS41ZEdBtvRnBl+rMWOGKIEM3EZkVqHR Uwb6vpTwODKBwByLTkMtQ0MgxdQmxs48+HWMkD19UYFvAqyjFtPOmu9RGe1FXKDMdVL4Hs wb3jmIf8l0088ATry8oIQls2w4b1GGcnX/cYM8YHPgZRp20vtLrA1GLjGF0NQ3sFyFYLAb 55yIJy10zWgyfOaVROwFK7zvykhyUI/Vf4oydG1r4C6WKCxjoeybYjfMV/mvsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935183; 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=k+QDp07SaRVq3QAaDdnQeMCP3dKhytSM6jiwmemd0Hc=; b=u657WtD/3z6bic4SaL5QLuoi1Bdhu6OLp+V8FK9UCcHhHWeEH9jH41NUd3ey8rzSHjwhMC Jh7iZWaKz+UoAPugfS3kBR8v3b0KHuXpwrpRLnEVZChb32+QJvCNQb0HH5Hp+i3h+Ai5h4 eRJD1YN8m58fm9XGwqEpPwy+RX++2a+wXaVOSJTEc+PRjR3uhVZCU65yCyxaFY8hAV2alm 2p34o7NNrBKd7NF8V0DJb6jACh9zw0RqDHX3a1u55ZgoioV3d9B0YpxvljwlHkkmYO4vqO Q89+s1M40MikN58fUedDWxWgLKySLoWDV+kWC6qyP6A6qo7qZamwzwcOTT4LHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jTWNH54jlzrjy for ; Tue, 17 Nov 2026 17:06:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f59d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:06:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c1b0ea1f72d7 - stable/15 - ptrace: Call ptrace_check_allowed() from the compat32 layer List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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/stable/15 X-Git-Reftype: branch X-Git-Commit: c1b0ea1f72d7c7ad21c969191d1bb85aac08d18f Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:06:23 +0000 Message-Id: <6afc898f.1f59d.5bf5350e@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c1b0ea1f72d7c7ad21c969191d1bb85aac08d18f commit c1b0ea1f72d7c7ad21c969191d1bb85aac08d18f Author: Mark Johnston AuthorDate: 2026-11-15 16:35:36 +0000 Commit: Mark Johnston CommitDate: 2026-11-17 17:02:15 +0000 ptrace: Call ptrace_check_allowed() from the compat32 layer Otherwise the checks there aren't applied to freebsd32 ptrace calls. Fixes: 7006cb7bd22d ("pdptrace(2): allow debugging in capability mode") Reviewed by: kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D61597 (cherry picked from commit 44ae34814f689bf640c03b7f26f4f540a5f92d54) --- sys/compat/freebsd32/freebsd32_misc.c | 5 ++++- sys/kern/sys_process.c | 2 +- sys/sys/ptrace.h | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index b6a097cd495e..b3debca0e351 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -1050,7 +1050,10 @@ freebsd32_ptrace_useraction(struct thread *td, int req, bool pd_mode, pid_t pid, void *addr; int data, error, i; - error = 0; + error = ptrace_check_allowed(td, req, pd_mode, pid); + if (error != 0) + return (error); + addr = &r; data = udata; diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index 56c5eebc8a85..c659622a68c3 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -675,7 +675,7 @@ ptrace_vm_entry(struct thread *td, struct proc *p, struct ptrace_vm_entry *pve) return (error); } -static int +int ptrace_check_allowed(struct thread *td, int req, bool pd_mode, pid_t pid) { if (!allow_ptrace) diff --git a/sys/sys/ptrace.h b/sys/sys/ptrace.h index aeabd1961c21..3acdf64c7bc7 100644 --- a/sys/sys/ptrace.h +++ b/sys/sys/ptrace.h @@ -292,6 +292,8 @@ int proc_write_dbregs32(struct thread *_td, struct dbreg32 *_dbreg32); #endif void ptrace_unsuspend(struct proc *p); +int ptrace_check_allowed(struct thread *td, int req, bool pd_mode, + pid_t pid); int ptrace_action(struct thread *td, int req, bool pd_mode, pid_t pid, int pfd, lwpid_t lwpid, void *addr, int data);