From nobody Wed May 13 19:40:31 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 4gG3j037yZz6cvPH for ; Wed, 13 May 2026 19:40:36 +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 4gG3j01R1Hz3VfP for ; Wed, 13 May 2026 19:40:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778701236; 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=dprnyI8lpzFMEiqu3+pk5T2eHp0hhGIvnVppjwrHBRs=; b=L5QemH15vDwz0eckKIX0fGMeu9QsmKtNgFrwA9D2W3wagC6o3NgkoIRtSbH6iR43F1IaTq 9Oqa3ndUXMRHhf8z18f+QPEjhyiUCb83FehPiSC74lR7XKboWfxgc5m9F8SepzxqCwULE7 xYsMcD2sK2YxrxmeYEQkLvGZjLdw2wtCvx7Szf/poflsWzYSC2bMapYWH6+NVFP++jFkJ8 BpwDqNGjhsjgt3kXsMbicicvDTWKeQ+1emlrRGOuJzCtGgxFty21u6FvN7PDoOc0engD3S 7EwFLwvO9XTxYq2G8BiQVHTSjObqe3ES1MJA0G3L4eJl1/7Wczk/JUIreQWOJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778701236; a=rsa-sha256; cv=none; b=vq9CcK0xBk8p2jYmEyGfHZC0JcskO5QoQWqLWL2QBlQZrAo+pRseiyOPB/but/Od3UT/SN 29R94UNyqde9N7B29fN1DBIhf+fKs75o1JZ1XUoqkNP6Ay+JP5+7BhH2ddnacYkzmAaCeX T9SM/KDvZPHmeRDv7E0DOlPCt5QM74c4x3He2JodMZI3wKAf29G+MWDc47CQIuzCSiZZDw pUNtr9u8X/73TRgLds25X1jxNKTwa12MWNyTX5i6iwuXEvioKFFZ4Jm5EJAAVxR3JN7mEE JdhaCuUTCCVBOr+JTUY/eo13DdBUhWl1RNU/RBgmrc9Lsm1FW7Wcn4ANt5wYFQ== 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=1778701236; 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=dprnyI8lpzFMEiqu3+pk5T2eHp0hhGIvnVppjwrHBRs=; b=quEez816oxL5v3/ucnF3sldWrS2u+BtoqwzEBKx2ST6SI83hpgbV63zMxlREbWVV3S0H78 d8I3z3GpNlLEzYeKzc9GNZrNKOLAYMiDSI0oScDlHR/U0m+LW8g9+MFXMXGi1DcdClOC4q gqJJZQ9eGrQlSNWHgVWtnrTLsHu0LP6kW38xsl67IUGA6oT8XT7ez4epGTZMVClTiQ0bip 57VyodQtQ7HkcesWHJgAhL3UOvoHZQb7i+HAny2GhQKuXaM6Nx+IX+StlnQAogaEpPTWA4 fLQ4psoXMMBDCDVTagVuUuK6Zjr4jRf0f3iImKsOSlvzxRUXhpLDZDain+QLiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG3j00mKfz140K for ; Wed, 13 May 2026 19:40:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31ba9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 19:40:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: cb31a266167c - main - 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cb31a266167c8bde3488fbdd6bf24c38b6f59977 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 19:40:31 +0000 Message-Id: <6a04d3af.31ba9.20680c0e@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cb31a266167c8bde3488fbdd6bf24c38b6f59977 commit cb31a266167c8bde3488fbdd6bf24c38b6f59977 Author: Konstantin Belousov AuthorDate: 2026-05-11 01:12:30 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-13 19:40:03 +0000 ptrace: clear TDP_USERWR after transparent attach only on attach The flag indicates that the modifying ptrace op was issued, and clearing it after transparent attach is needed to not leak the flag to later operations, since it is cleared on the syscall enter. But clearing it there unconditionally is too strong. The clearing should be only done for attach situation. Reported by: Alex S Fixes: 99976934274de6fa19f049a0b6eac10856710f96 Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D56928 --- 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 dece6457a4bf..5effc6fbe2d7 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -1411,17 +1411,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; } /*