From nobody Mon Jul 27 00:30:08 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 4h7fcx2KWfz6mC1M for ; Mon, 27 Jul 2026 00:30:09 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h7fcx0H00z3Fjf for ; Mon, 27 Jul 2026 00:30:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785112209; 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=8JtJwAVPSel4fWP6e0uVGZxjDR923QU4zIXgkWfGVaI=; b=yvETpmXntXqSWL2zUtLsrUt703O25y5wLzWoM2Gp4am0bYaf0xidN8WZ4V474V5FDu6hIr gM7nrgoFeeuOhr7rZne3lU1VSye+GPhll7t/AhJVTBoRkmPPCXBYTKkJ/S+CMGcAmkUstD i0QqRVoL3iYptx+r+w9I25MeLlqUsp3Bgzt6KRXZ4AdNizXKu5hHzpv7RFhndd8XdpXr0Y 3A9WHsIqzpSeTfhG5OG4T8ezFf5yZW/WOhKh5U94cGZMVMHBYpXyYJndGIP3eaFNZZdWfb Hy3zJ+8DcJoctKHVS7OtEfZa3+n3D+LlO+1yyDIWpOa4AjKd8SVSpvZUvnwM3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785112209; a=rsa-sha256; cv=none; b=wBERJmfjHimURxNQghInheenJEwcEqbiI4+RvjgFeYVwdVCKRgyvfwJen6nXIxL/7IBKGp 86tgBGwSlEK/bICNftSfLpP0PNg2iM7/ch0MvPtskOCJrU1HSW9UVe1eY7xX3CJQPO8/L8 Xc0GEuHGBPavGBDMeCBzjx0pywqc+opQV6evTPVgFCtTh8AyPd0n1jF7Ql8xex7vBmVi3y hE3tzkaDMt4wjvfUuAXeT2JeKHdM/OU/LpQCUevnPbs6pcFVcNZFBU7mt0MUbQTEWxMvOU zd7YwVrScbxKSLMWCo4M0kBd8oK8GKaxBL+C4RQD+d8WHz6XCJT/J7T3BkbcKA== 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=1785112209; 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=8JtJwAVPSel4fWP6e0uVGZxjDR923QU4zIXgkWfGVaI=; b=kMOVRKdBX9q8RksBgNIeWTOUNC3A3Kp2GL/WmKdKDNnJ7V97IWlgVXLc8alGV1EnC4nWew fQYxSjxJUZj5awgc1Ep+nZ5ghtCD6hZKMw1xueqgkdjeanxWptSLVjheM2s3URtW2lV+Y3 2WvWWm79v81ElD7bMIvWaW+3d3sGEGQfn8ybwnTnNEABrFil4VOQTZxsi4YZEIkDV8bJjn nTQ8FsK3Ol75bEdyOe9/ZxAABtqoPc5mDCgtM5kKPcFyf3mXpbwRMgOcz6kWh4NRk5nC+v gqZ7YvWNHJBFhDUVdoqIDqHG2EuC28jNbZ6xM/2c0L/SZ3ORkzbb1pOnJEkhJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h7fcw6CCszm2v for ; Mon, 27 Jul 2026 00:30:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27e47 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Jul 2026 00:30:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 1e5d774279e1 - stable/15 - kern/sys_ptrace: do not skip P2_PTRACEREQ wait for PT_CLEARSTEP/PT_GET_CHILDREN List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1e5d774279e193eba2fb36386b637f994eba038f Auto-Submitted: auto-generated Date: Mon, 27 Jul 2026 00:30:08 +0000 Message-Id: <6a66a690.27e47.4ad73368@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1e5d774279e193eba2fb36386b637f994eba038f commit 1e5d774279e193eba2fb36386b637f994eba038f Author: Konstantin Belousov AuthorDate: 2026-07-20 22:09:59 +0000 Commit: Konstantin Belousov CommitDate: 2026-07-27 00:28:43 +0000 kern/sys_ptrace: do not skip P2_PTRACEREQ wait for PT_CLEARSTEP/PT_GET_CHILDREN (cherry picked from commit eca7b25c101a240472c4c274e725bc294284c827) --- sys/kern/sys_process.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index b5cba235de47..43cea67d1e1a 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -1031,7 +1031,7 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) #ifdef COMPAT_FREEBSD32 int wrap32 = 0, safe = 0; #endif - bool proctree_locked, p2_req_set; + bool need_can_ptrace, proctree_locked, p2_req_set; curp = td->td_proc; proctree_locked = false; @@ -1124,6 +1124,7 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) /* * Permissions check */ + need_can_ptrace = true; switch (req) { case PT_TRACE_ME: /* @@ -1166,26 +1167,24 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) /* OK */ break; - case PT_CLEARSTEP: - /* Allow thread to clear single step for itself */ - if (td->td_tid == tid) - break; - goto default_check; - - case PT_GET_CHILDREN: - if (p == curp) - break; - goto default_check; - -default_check: default: + /* + * Allow thread to clear single step for itself. + * PT_GET_CHILDREN on itself does not need P_TRACED. + */ + if ((req == PT_CLEARSTEP && td->td_tid == tid) || + (req == PT_GET_CHILDREN && p == curp)) + need_can_ptrace = false; + /* * Check for ptrace eligibility before waiting for * holds to drain. */ - error = proc_can_ptrace(td, p); - if (error != 0) - goto fail; + if (need_can_ptrace) { + error = proc_can_ptrace(td, p); + if (error != 0) + goto fail; + } /* * Block parallel ptrace requests. Most important, do @@ -1203,7 +1202,7 @@ default_check: } if (error == 0 && td2->td_proc != p) error = ESRCH; - if (error == 0) + if (error == 0 && need_can_ptrace) error = proc_can_ptrace(td, p); if (error != 0) goto fail;