From nobody Mon Apr 07 01:29:18 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 4ZWBSy5DWBz5sNpd; Mon, 07 Apr 2025 01:29:22 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZWBSt1zq7z3wn9; Mon, 07 Apr 2025 01:29:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743989358; 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=JDuUyt/RWyJseVfVY8H5HsL2QYiYyuoMVwUrCkjN7UQ=; b=tlnTjc8mRKomncZGp30gv4BaFlSi7E4uTO+mX7St1VTb/LL7OP3M/n4usoIei6cHgZtQTd +c5FqPxUf2/0CmoXDKeZdgz6r3nJcM/fIdjgIh7EuPpqYfFQ1vNQ8vPoRVQmfpFxhmfijQ lJZKWfgrtR3V6ba81Q5q+TYAxbTie2Y1fMsZKokPKN/8eWsqdHbuOcBt0xsabT+8rDA0PT 8qmRnj8pvXlJNx8JvGxT5VRsmX+YHKwnlh923Z0Hoa0nCO+JoNcm4CHAtWnOVteomReWb7 89HjDPwH9mRV1zfZKtwUwV1haMxViq+PtHRxhPqUWO1QkHcSpsjoyqemFg9EfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743989358; a=rsa-sha256; cv=none; b=Nll6js1RZuffSx8gi1duJRiEnyf9jPe7VZriFIZrdViK4IbjNlFVoXJi68nND+r/j3OSqd uJNSInrRXvK1ajthJKA56Zkm2PMndK9PJ6d+V3fZ0RVvBHotE9wN/7vKArJShSKgjXYGt2 yg+fIp2sfoL5g+S2rM0LpC8QFsrNF7To2TpPM5Fz8RMWyEYMSaUFOjL/h9GJSco31s0PqR YtMpqQVjUs4Qn39qlkQx7xwcvNta63InoEZsYoyy/umUHqRnnc1xYOz+TZp89gzvvsXK/0 Y8XKhS9jaRl5an8DC61ID7G6TOsGgCVxPnCNBw5JaLVJYdaQ1k1oxGHN39IE/Q== 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=1743989358; 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=JDuUyt/RWyJseVfVY8H5HsL2QYiYyuoMVwUrCkjN7UQ=; b=K/PWzO8vBUO+CZzbKAYY4/vGwKjNrXLlBwmbNOEthyhm1eBcrw636+r40X3gG+sv1PQISU FWrByJXSeyH7d52fkgyGWkAfOpCOppgzRCFXgPf71RwqpT/UPELzrKOq9yzgGp0FKYOJMq I4fQwQrj/wW0LeB3mHFiIOUZ+gBnI6RDgwJsWWBpu9wyLWhUqmuvM1MVq9nB9ZknlcEeO9 NRFrDynbLaSnb0eyPRLJrYJ8eGjZn2evT3Mh97OQlNBu81L+Ih821UC34LIiLDdHitWmro uEedU0erflIIyUxvJ8SMU+rEZHSMDiMhBrHbNEDOncWGupwbP3AS5zGfKbCicQ== 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 4ZWBSt1Bpyz9V5; Mon, 07 Apr 2025 01:29:18 +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 5371TIQN063466; Mon, 7 Apr 2025 01:29:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5371TIY6063463; Mon, 7 Apr 2025 01:29:18 GMT (envelope-from git) Date: Mon, 7 Apr 2025 01:29:18 GMT Message-Id: <202504070129.5371TIY6063463@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: fdbf48835da5 - stable/14 - ptrace(2): expand ability to fetch syscall parameters 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: fdbf48835da5d38fa7d156bdd3e899c7664c7e08 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fdbf48835da5d38fa7d156bdd3e899c7664c7e08 commit fdbf48835da5d38fa7d156bdd3e899c7664c7e08 Author: Konstantin Belousov AuthorDate: 2025-03-20 01:52:29 +0000 Commit: Konstantin Belousov CommitDate: 2025-04-07 01:28:22 +0000 ptrace(2): expand ability to fetch syscall parameters (cherry picked from commit fd5bc306ff3d8f908f36703d6ab714322f9f3c75) --- sys/kern/kern_sig.c | 8 ++++++++ sys/kern/sys_process.c | 8 +++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 6661f4cd6187..8e5c9f247b57 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -345,6 +345,14 @@ ast_sig(struct thread *td, int tda) * the postsig() loop was performed. */ sigfastblock_setpend(td, resched_sigs); + + /* + * Clear td_sa.code: signal to ptrace that syscall arguments + * are unavailable after this point. This AST handler is the + * last chance for ptracestop() to signal the tracer before + * the tracee returns to userspace. + */ + td->td_sa.code = 0; } static void diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index a6cc9a36643b..19fe8bcc7627 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -1174,7 +1174,8 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) case PT_GET_SC_ARGS: CTR1(KTR_PTRACE, "PT_GET_SC_ARGS: pid %d", p->p_pid); - if ((td2->td_dbgflags & (TDB_SCE | TDB_SCX)) == 0 + if (((td2->td_dbgflags & (TDB_SCE | TDB_SCX)) == 0 && + td2->td_sa.code == 0) #ifdef COMPAT_FREEBSD32 || (wrap32 && !safe) #endif @@ -1517,12 +1518,9 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) pl->pl_sigmask = td2->td_sigmask; pl->pl_siglist = td2->td_siglist; strcpy(pl->pl_tdname, td2->td_name); - if ((td2->td_dbgflags & (TDB_SCE | TDB_SCX)) != 0) { + if (td2->td_sa.code != 0) { pl->pl_syscall_code = td2->td_sa.code; pl->pl_syscall_narg = td2->td_sa.callp->sy_narg; - } else { - pl->pl_syscall_code = 0; - pl->pl_syscall_narg = 0; } CTR6(KTR_PTRACE, "PT_LWPINFO: tid %d (pid %d) event %d flags %#x child pid %d syscall %d",