From nobody Tue Nov 17 17:02:10 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 4jTWHR0Fdwz71QjH for ; Tue, 17 Nov 2026 17:02:11 +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 4jTWHQ5hHjz3QQw for ; Tue, 17 Nov 2026 17:02:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794934930; 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=3fDx0cQJ5BqjEeLhXQ5Tmo/endVsWQCfMP9/MWnfYys=; b=UNZ2+d/H7drcqvNQXLl2yCDQAEooVx3++jOQxByQ1gd5DDqJu2WUE0EWziTOZmciVJmwU9 iwLrnHGPZHF6MX8+i49txpuolKpPO+h7nsQJt58U13XcYwBJJolnNdYE7MbwT0GAEk3w5M +49YYg1FndxzSACj6FaBKv4eUFWx2pYUO3Au/LdtXrHhLM2s+8Uzg6O/jXJkyqXZeBvVV6 mK6/0QaAw95+fAavqxpoIpPYmQBU0Xo4YnFEkUeLnAsg2tAyjQ7SO+qlGzm3nlnKjv0kq1 r6XO59vIVYCvkWEnjrwp+vlUhenrklJm2dFwz+aApjtcC7a9CsvnZlaVds2E8A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794934930; b=SE7lFDwalv7wVBM0rB5dBocIhqS/J5biGb4wImUqIe4UhwVGyyXxhKcQiQDmfBxy1WDfI5 POxf76cyx6sVZFPu9DJUDfKIJ0Vh5KBbVNDUjjwDVdSMK0F367j6UUNbnDtWaflHYV3zMs 3XNpu0PibsJ3g+3hWpPWNDcVJ+2atprcqcFD8BMbZ4N6jVXbYQT+hAbQbfHkEbUHBdHXnU DTvSk0fsjZYhFQ6+ju12jvNLY6bEiniv0LrgW2pWDHNFD2AI19v1b0p+KOn15GozHgByY3 UEFrasURNF7d8vncbkkSFVEKqn+PhqprdgGzUYE4jJhbbYk0VBx2LKboPjRxtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794934930; 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=3fDx0cQJ5BqjEeLhXQ5Tmo/endVsWQCfMP9/MWnfYys=; b=xZEmkRzfTnkVVR99vtfP7oQUvOYY7hMeqSZ/RIThUPBOK0W4uVMq4Nm1XwIBMFjczgTWo8 dHPNT5+ynPiOVqZiWp4RS7FGurTUngT6VwB8cjzqvPd+TM4GFMLO1DXFekkgmnB56niyn4 ogjqZA+vVIFIzHl/6p0jT7f+lS+4YiJNTpPnXa1Yhs/u5DumYmPFxr057vdR+JdRS+rPLQ YsVWlIWCIJmBWTdmNsPjvRNiM0IzUu/uAcwHikiVhBDJibJbtpKtORycHuOtchTBfBgR21 Kp9Ui5RPFEdeSdVJybxOidyXrFs5sMfvgjXv7T/6+dVyoMyysmVFCoMnOkuGzg== 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 4jTWHQ53lQzrg9 for ; Tue, 17 Nov 2026 17:02:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e7e2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:02:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 44ae34814f68 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 44ae34814f689bf640c03b7f26f4f540a5f92d54 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:02:10 +0000 Message-Id: <6afc8892.1e7e2.10d659f2@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=44ae34814f689bf640c03b7f26f4f540a5f92d54 commit 44ae34814f689bf640c03b7f26f4f540a5f92d54 Author: Mark Johnston AuthorDate: 2026-11-15 16:35:36 +0000 Commit: Mark Johnston CommitDate: 2026-11-17 16:57:02 +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 --- 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 a6604fffad34..37a29878dfb3 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 9b4f8dffddda..aa89779c4d42 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -709,7 +709,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 d6e071285eac..265db2697433 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);