From nobody Thu Jun 12 18:03:01 2025 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 4bJ9P20nkjz5y9rH; Thu, 12 Jun 2025 18:03:02 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bJ9P15ftTz4PkM; Thu, 12 Jun 2025 18:03:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749751381; 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=HmxTNTGHlIMnbZPz0lVZQ2Xra6wWJLZLw8XqBdXdQ08=; b=A3OneyB4bfnbu2hFE9lLb+a0dYQLgG6Jswv0j3Ke9DLZQ9I1TXvvFKEwZ68AiSxYSw74kd qjYtsXiUPVheLv4xOx71Q3lOpGOkOuNJVswc6785JM74Gy6B/jat040iNMnrKnLoaBSFyg FzM6eebDlinf3gh9glrtg/8xFeagb13e5HscF0/TtXRqoNnHHEw1ddpW2duez8odD8LPFO xqNXhdKqvtRzHGEStA+i98wfVUM1mH2o8s5sAD68t+jxLGV9I4misP5Lzt/LrW1Ozv22ql z72CIcZMmld7+FnoxcShuuMwSPI8rC1PozsupEJYTHqkMABCFL5aKjs9/ybNvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749751381; 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=HmxTNTGHlIMnbZPz0lVZQ2Xra6wWJLZLw8XqBdXdQ08=; b=EF5G8ew3cHKSY7ffJLEoYoBm/wpOvq5DJ86PZZEm/z/E/RZPkiADw020wqy13HirZpfyEB oqf5v/3PcCgBVvVMhbWyKYfgph/0M+cVx6GaXFX+dn5M5nTYnNpRdbawYzabyH/f7qPhOC P1m/u4cA36m+cbDN42JclCmzY2p8imN3uuAMdv1+Mw+p6nwl73DiWrFFI3DPVAL4MxAYdG xotAgq6SYiuzRo3c2RfdfcXRItVL6m5vnn9O7juSaPi6CbcQzzmK5tXqvVrMo6WfWHkXJe NMik25GHxZTPFNhm0yyhfrFYFSRA3imn1+PlC2MICp8QiJ1Wa1XvstBp9zJojw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749751381; a=rsa-sha256; cv=none; b=xmDMSqO0Ky5E8e1f9i9UAzOliaY1pQAiLO0SK2Q9E9yuZ2771+DD5MUlMk41v/yrmz6AtB px9a8qooiFeQCjs5qRrWU3tZu1/FOrVr4VXi6AH4rFQF6mIvYrG69kuQpFg7e7/jonN8YM iYAHI847rHapDFy9x2xXC/+n8+MYe8lcb1ROIqcZ0R/SaP1PRBGUltqJGxGaPXFcBWpwn7 kU2hoP822Jwag/+oxe2fy+elky5yIZ4cdnAc14BbpjzwctctEFNtX0UBeNPN0B9GfDxZpH XFsAIvP5Cw93CUGxY1Ka6vNZga2r/1M/ZpIZjPYcs5DtqR13MEyE6/xeh5u0jw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bJ9P150tWz7XR; Thu, 12 Jun 2025 18:03:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55CI31K1067115; Thu, 12 Jun 2025 18:03:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55CI31Wr067112; Thu, 12 Jun 2025 18:03:01 GMT (envelope-from git) Date: Thu, 12 Jun 2025 18:03:01 GMT Message-Id: <202506121803.55CI31Wr067112@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 4937026659c6 - stable/14 - amd64: add ptrace PT_{GET,SET}TLSBASE requests 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 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/14 X-Git-Reftype: branch X-Git-Commit: 4937026659c6b2bfad27ad5392c439048fc03b76 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4937026659c6b2bfad27ad5392c439048fc03b76 commit 4937026659c6b2bfad27ad5392c439048fc03b76 Author: Konstantin Belousov AuthorDate: 2025-05-22 06:56:24 +0000 Commit: Konstantin Belousov CommitDate: 2025-06-12 18:02:50 +0000 amd64: add ptrace PT_{GET,SET}TLSBASE requests (cherry picked from commit 7171e591a4c70eb4ee616e33373fd62773ad5a08) --- sys/amd64/amd64/ptrace_machdep.c | 21 +++++++++++++++++++++ sys/x86/include/ptrace.h | 2 ++ 2 files changed, 23 insertions(+) diff --git a/sys/amd64/amd64/ptrace_machdep.c b/sys/amd64/amd64/ptrace_machdep.c index 3fce9826b882..0159c6de49d9 100644 --- a/sys/amd64/amd64/ptrace_machdep.c +++ b/sys/amd64/amd64/ptrace_machdep.c @@ -373,6 +373,27 @@ cpu_ptrace(struct thread *td, int req, void *addr, int data) cpu_ptrace_setbase(td, req, rv); break; + case PT_GETTLSBASE: + pcb = td->td_pcb; + if ((pcb->pcb_flags & PCB_TLSBASE) != 0) + error = copyout(&pcb->pcb_tlsbase, addr, sizeof(*r)); + else + error = ESRCH; + break; + + case PT_SETTLSBASE: + pcb = td->td_pcb; + error = copyin(addr, &rv, sizeof(rv)); + if (error != 0) + break; + if (rv >= td->td_proc->p_sysent->sv_maxuser) { + error = EINVAL; + break; + } + pcb->pcb_tlsbase = rv; + set_pcb_flags(pcb, PCB_TLSBASE); + break; + default: error = EINVAL; break; diff --git a/sys/x86/include/ptrace.h b/sys/x86/include/ptrace.h index 36ce8870df35..0d5b57234523 100644 --- a/sys/x86/include/ptrace.h +++ b/sys/x86/include/ptrace.h @@ -56,6 +56,8 @@ #define PT_SETFSBASE (PT_FIRSTMACH + 8) #define PT_GETGSBASE (PT_FIRSTMACH + 9) #define PT_SETGSBASE (PT_FIRSTMACH + 10) +#define PT_GETTLSBASE (PT_FIRSTMACH + 11) +#define PT_SETTLSBASE (PT_FIRSTMACH + 12) /* Argument structure for PT_GETXSTATE_INFO. */ struct ptrace_xstate_info {