From nobody Sat Sep 05 00:35:26 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 4hcDrc1XR0z6qZYJ for ; Sat, 05 Sep 2026 00:35:28 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hcDrb1Cmyz449h for ; Sat, 05 Sep 2026 00:35:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788568527; 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=qICzVVf1CMN1aLDDJLBqW7vXJkjD7mJ4IZyRzrhnfC0=; b=PRT/cc3hJ5MVUSaQOex7P+fvrLPbCx7aLk7xNTUQ5EvXM9SJGugzDU7LCwU1Kyx0xKEVWw U+ARSbc81XIcLUSoa0fYYKtJmwKeJ7C4pxC5y1Q3hLaue5nr8Q/wJDjwm3DT9U4ntALWV/ YlkqgTux0JNGs41KETBA04IqPIXxquCdW+pkOFzmp5EamgOBkIppdi7p/HgM3li3sa8rpd XHRz62kE3O9ID3UrLTt57PuR2eVWoVnTOa/C2k8cL7vwne2NnLfRGZ3G4TtdlbsAm6fap2 r9w9X4MS11V0mM3PDbLooLXK43/pJbm1m1EO1F8h7tS5vP0fqS4aQ6iBHBaszQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788568527; a=rsa-sha256; cv=none; b=nKMnqxtpBy7shbjjwnNrWQwmzLyFRd+Z/KcZ5lUsvDbOJdbVQrQbLdq3wyjC3kY43qPbPZ XAOicH2XUPDP9s3HywyxcEiD3KLOzjxh0jPBTxG4fIZY6isEz+HnmMXKu6CUqvcXCLJdAB aognIRAKyEcOq2b7v6PREQkdl41Eu4ip3GffiSERBamqyHpm1NOmH3b5qhLNgYAzZkVPi+ Z7y7d7y6gHqT9mfGlVX85f6MAR58hsyKsKYGVXqtrXIGH6hyDyZnU7riLCWrVh1uac5xMh 7ZIfOGkLOmzwiBwhjgMKziOj0yfsHL5oMaTBw4y3zF2u4yDKZqOJb2JyXBe7XQ== 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=1788568527; 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=qICzVVf1CMN1aLDDJLBqW7vXJkjD7mJ4IZyRzrhnfC0=; b=H7PvY9jj0jL5rXasdWqL/twkF1b7KR/nYAL13UxhOwdf3N2kdXErX7WaQhrl0qRi+x8l5C gEG/ZeIVJjaBA9XD4DlEuOnVLhgXRCuWqdeERht0clfkiZ+QnFwQcxrwN+qeEY3ssTrHLu wOMO1T9hTBNo9n7lHvpRnNRslp8uReNCB+oNdP6ZQxiIb3h0x2b3DwG88Br2NiX2AqFTzU uJl3bBKZpdIk27nG4NwZLUTv9s6gYqUzYWnb4AHo/CxTJxfEXUaL3FzzoPkJ4OvAwULRvl /GlgzAwoYYH69bpW+EAQ+xJTtBdpU4JwlGRCIhGT7evUfjmw/r5Jc/UJQa6Acw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hcDrZ75L8z73Y for ; Sat, 05 Sep 2026 00:35:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f33f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 05 Sep 2026 00:35:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 39321b7a1462 - stable/15 - ptrace(2): add PT_GET_ABI_NAME request 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: 39321b7a14620485f1fd9ff7b769398cfda2dfdb Auto-Submitted: auto-generated Date: Sat, 05 Sep 2026 00:35:26 +0000 Message-Id: <6a9b63ce.1f33f.2435b8b3@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=39321b7a14620485f1fd9ff7b769398cfda2dfdb commit 39321b7a14620485f1fd9ff7b769398cfda2dfdb Author: Konstantin Belousov AuthorDate: 2026-08-22 22:53:14 +0000 Commit: Konstantin Belousov CommitDate: 2026-09-05 00:33:40 +0000 ptrace(2): add PT_GET_ABI_NAME request (cherry picked from commit 6b9ef5dfc903c29e1d23bb6369b762251f2608f7) --- sys/compat/freebsd32/freebsd32_misc.c | 12 ++++++++++++ sys/kern/sys_process.c | 20 +++++++++++++++++++- sys/sys/ptrace.h | 1 + 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 103a40f221ac..4da3b4ee97c1 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -1033,6 +1033,7 @@ freebsd32_ptrace_useraction(struct thread *td, int req, bool pd_mode, pid_t pid, struct ptrace_sc_ret psr; int ptevents; struct ptrace_child *children; + char sv_name[32]; } r; union { struct ptrace_io_desc32 piod; @@ -1171,6 +1172,13 @@ freebsd32_ptrace_useraction(struct thread *td, int req, bool pd_mode, pid_t pid, else addr = &r.children; break; + case PT_GET_ABI_NAME: + if (udata < 0) { + error = EINVAL; + break; + } + data = sizeof(r.sv_name); + break; case PTINTERNAL_FIRST ... PTINTERNAL_LAST: error = EINVAL; break; @@ -1245,6 +1253,10 @@ freebsd32_ptrace_useraction(struct thread *td, int req, bool pd_mode, pid_t pid, free(r.children, M_TEMP); } break; + case PT_GET_ABI_NAME: + error = udata <= strlen(r.sv_name) ? ENOMEM : + copyout(&r.sv_name, uaddr, strlen(r.sv_name) + 1); + break; } return (error); diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index 17ddf6d0bcfc..0752e84e7c4e 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -703,10 +703,11 @@ ptrace_useraction(struct thread *td, int req, bool pd_mode, pid_t pid, int pfd, struct ptrace_sc_ret psr; int ptevents; struct ptrace_child *children; + char sv_name[32]; } r; syscallarg_t pscr_args[nitems(td->td_sa.args)]; void *addr; - int error; + int error, data; if (!allow_ptrace) return (ENOSYS); @@ -783,6 +784,14 @@ ptrace_useraction(struct thread *td, int req, bool pd_mode, pid_t pid, int pfd, else addr = &r.children; break; + case PT_GET_ABI_NAME: + if (udata < 0) { + error = EINVAL; + break; + } + data = udata; + udata = sizeof(r.sv_name); + break; case PTINTERNAL_FIRST ... PTINTERNAL_LAST: error = EINVAL; break; @@ -842,6 +851,10 @@ ptrace_useraction(struct thread *td, int req, bool pd_mode, pid_t pid, int pfd, free(r.children, M_TEMP); } break; + case PT_GET_ABI_NAME: + error = data <= strlen(r.sv_name) ? ENOMEM : + copyout(&r.sv_name, uaddr, strlen(r.sv_name) + 1); + break; } return (error); @@ -1975,6 +1988,11 @@ get_children_repeat: PROC_LOCK(p); break; + case PT_GET_ABI_NAME: + if (strlcpy(addr, p->p_sysent->sv_name, data) >= data) + error = ENOMEM; + break; + default: #ifdef __HAVE_PTRACE_MACHDEP if (req >= PT_FIRSTMACH) { diff --git a/sys/sys/ptrace.h b/sys/sys/ptrace.h index 8d6d9535e825..942af4eba51f 100644 --- a/sys/sys/ptrace.h +++ b/sys/sys/ptrace.h @@ -87,6 +87,7 @@ #define PT_SC_REMOTE 44 /* Execute a syscall */ #define PT_SET_SC_RET 45 /* Set (fake) syscall results */ #define PT_GET_CHILDREN 46 /* Report children */ +#define PT_GET_ABI_NAME 47 /* Report ABI name */ #define PT_FIRSTMACH 64 /* for machine-specific requests */ #define PT_LASTMACH 127