From nobody Sun May 17 00:29:39 2026 X-Original-To: dev-commits-src-branches@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 4gJ1z74Qwlz6dLry for ; Sun, 17 May 2026 00:29:39 +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 4gJ1z72qbbz4DvC for ; Sun, 17 May 2026 00:29:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778977779; 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=hlN3of1Dz+srJ0e0nOOTHnvPOuZi21W6nwmwWnc7xLA=; b=fSAv/7f6gU2lY3rUk/TV+0JG8BUTE6XL2zfY9fpDNvW2VHgPOXi/TtCF4zO98zw4EQkfKF VXpk1hLoQESAr0vyRuIbGxdsr4qC5RRU/fqOITblKiRK89hK0k87Eekqvf8UHR+RSA9XIK wkcm2cZSDhAVBV85DQb+MVYoxj3hxNJl6J3TTQ+ChWjZX00W5Ym/90BDu8hAxo5vC131L/ ZmMh0pPMh4kkPZkNpdx9AWtRUQTGQJChEnigQt16seXAX5eoEPZ8SYaI+Rh/FlLEe2bUYn HHmJuIIjG8EpQjVBC2URLqCacYY9ZTkgpjWc3fmAtWzPND9TlCoKcW5P1cixFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778977779; a=rsa-sha256; cv=none; b=uyBuaBDUK4hEZyB7PDKdgegudw8G7VcgMEtVlkY8F6Fkn4tYhrHDjrX4ndEj4kNWeG0Bav G/dFsn8SYd/KBytpeck2VsSgkWJJJZlBhcd41PW55GcSNDm8g3EvCuoDRy56c/t8cxcEJf wyYMheAXdPQ6Gp1msqligrb/eojXRG38VW58DMBMbw+JOU6ckw3H20+Mybo8wPloklfsUQ WwbM02eiNQ+DLLjj/UR+dWZfdEweykHEmTVUwe6v2Cyy+DHbM2r1EG5I+e/ZefHEqscCSp XXdQO81qjBnt7bZtg2IUb2a+RoktTsXQwE4sBpJf5MVDvgbJ4amvxSmrYhKeGg== 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=1778977779; 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=hlN3of1Dz+srJ0e0nOOTHnvPOuZi21W6nwmwWnc7xLA=; b=iOps+u4OI1uDoTDyV5HOW1dqFFbQGK1kjKaO22G4j4QuwGaEJ58a/Mf7v5rW6abOxI1ftg ulgq6SFmPB87OVS3qpEyQ2pquiu2cxKlTSJNe1A77XAaI0AtSdgd/JZxveAMlEwnCTjWSt eW/Xy/0gcI/DqE9cNgBeVTiD6/qwbXboFJb2loTAjYEfHEfgtwTylbOyNHZg9OORVyxxyT mDh5NdhQu1kMWlHC2obdN6mAr6DNGjIvnpELFYVrJoddavyrpj4T5SviWPE+H1SaYuRjOq 1MMYHHAUXjHRIyAISVdOHIA+EOx6TP2OtB4exybltK9gEbAX206euUkELZ8HZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJ1z72NQzz2by for ; Sun, 17 May 2026 00:29:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21cc0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 17 May 2026 00:29:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: bce6e0e90328 - stable/15 - ptrace: clear TDP_USERWR after transparent attach only on attach List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: bce6e0e903288aa128bdd8ec45005d1416c4c764 Auto-Submitted: auto-generated Date: Sun, 17 May 2026 00:29:39 +0000 Message-Id: <6a090bf3.21cc0.455dca74@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bce6e0e903288aa128bdd8ec45005d1416c4c764 commit bce6e0e903288aa128bdd8ec45005d1416c4c764 Author: Konstantin Belousov AuthorDate: 2026-05-11 01:12:30 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-17 00:27:48 +0000 ptrace: clear TDP_USERWR after transparent attach only on attach (cherry picked from commit cb31a266167c8bde3488fbdd6bf24c38b6f59977) --- 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; } /*