From nobody Thu May 21 21:21:49 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 4gM1ZC4Cqzz6f0GV for ; Thu, 21 May 2026 21:21:55 +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 4gM1ZB56NQz3D9t for ; Thu, 21 May 2026 21:21:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779398514; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SdbFQHOJJqhAHPaplPSdFhamFQngddHvkv6TWVlnWeE=; b=GKHGvFGSbGlDqCd00bP3qx+CRDqnWk06Aq/DESsY5/ij7P9ng5obqAzvUIcswGldjMDs5J Iw4qsf2tY9UT8GsnA05zt55p2iYzgARtdOtrKLJPc3jReEDu7mxntbJhq0cNmRBlV5WFvh 8gPGJgJ8M+e8hGxve/X/qtHwbwXc3z5kXeZ4bbqt+xkKSgEtaAclotFQ/W4Mm9EU+QLoqe UT5Ux7p7uHx8nzBSqS4SBTlox1N1BQndZXr/xeCdn6NKefg/DTYaMHRR+zpuWue2l4v6dc +q/fzI6Q/b40y8XdQG+HA6Fflu66MTkCVd7nqsJFE2mA3elZ/gCXx5N+OzeR/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779398514; a=rsa-sha256; cv=none; b=LxJABNDzLG6SdjnMGN5aQFzeMnyFH5Yh+tRrhLT4snKeNqrjWgGQL/9J8ViBpyJNAZnFLz LDD75lhfUZjuu2g4/6O5s0EPp0K3Qcfaw8hCf0pMbIruNgwmmJqhLBld3egkbQe2C1f5p2 8Yx5nJsuMxH1z/V8qhuwk7iXg/CcBf0H+EVO3g/WywlLIkr3aqtPif+MT5s9C16Y61VYBV rzJ5JVq2jZy4/Rg62gJfiGapDOpPeknLYUoAk0/vowh2ZYnyxztpXOyEKbSPLO0pkKzs97 ELkmqFLKjOJ5Nj+ZO3ZkmS3nmX5OwEmsPli5NBPAYncHo2XgHcTOSThsQJ/W6Q== 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=1779398514; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SdbFQHOJJqhAHPaplPSdFhamFQngddHvkv6TWVlnWeE=; b=ibKNIS0EQ1WRFT6b+Nu+Eqi0EV2M9+mq+E2GT2dm51LFLjno+S/cTThIC7opSkUv+hZ8SG Gx+hpJaCEETwntJj0g06QljoMXjK8LYjv9ipx3QmMpX4i/Drfd7D8rFXhF6oExI2NP0iQ/ Ebb+OmHvoFbZQFBSBJ0dwbgEWHHHceCkgssMl7byp/aSwh4Mgcd+zsPK0Ieo125UbeY7bl UWk0svwN+g+8IP900paqVqIW6oLhXlEFWPirw6KMQnKhbZZOXRiNTedDXVHrUU4W+MbWtn nuvt+l8LU2hCFSEEFAsFc4iIHTwSaOLrwClcRDgEf5hGlsQ9hq1pQXh4GMk3Vg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gM1ZB4hDvzqrZ for ; Thu, 21 May 2026 21:21:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e237 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 21 May 2026 21:21:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Colin Percival Subject: git: d6bbb597049c - releng/15.1 - ptrace: clear TDP_USERWR after transparent attach only on attach 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: d6bbb597049cafced800585b72a155473b93331c Auto-Submitted: auto-generated Date: Thu, 21 May 2026 21:21:49 +0000 Message-Id: <6a0f776d.1e237.5ad66d65@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=d6bbb597049cafced800585b72a155473b93331c commit d6bbb597049cafced800585b72a155473b93331c Author: Konstantin Belousov AuthorDate: 2026-05-11 01:12:30 +0000 Commit: Colin Percival CommitDate: 2026-05-21 21:20:30 +0000 ptrace: clear TDP_USERWR after transparent attach only on attach Approved by: re (cperciva) (cherry picked from commit cb31a266167c8bde3488fbdd6bf24c38b6f59977) (cherry picked from commit bce6e0e903288aa128bdd8ec45005d1416c4c764) --- sys/kern/sys_process.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index c67996ad7df1..7225a63328b4 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -1377,17 +1377,16 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) * register file or specifying the pc, make the thread * xstopped by waking it up. */ - if ((td2->td_dbgflags & TDB_USERWR) != 0) { - if (pt_attach_transparent) { - thread_lock(td2); - if (TD_ON_SLEEPQ(td2) && - (td2->td_flags & TDF_SINTR) != 0) { - sleepq_abort(td2, EINTR); - } else { - thread_unlock(td2); - } + if ((td2->td_dbgflags & TDB_USERWR) != 0 && + pt_attach_transparent) { + thread_lock(td2); + if (TD_ON_SLEEPQ(td2) && + (td2->td_flags & TDF_SINTR) != 0) { + td2->td_dbgflags &= ~TDB_USERWR; + sleepq_abort(td2, EINTR); + } else { + thread_unlock(td2); } - td2->td_dbgflags &= ~TDB_USERWR; } /*