From nobody Fri Jun 17 19:38:15 2022 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 C2F2B85B25B; Fri, 17 Jun 2022 19:38:16 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LPq8S1XBQz3QFj; Fri, 17 Jun 2022 19:38:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494696; 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=4vjJ1SlCtjpV0mwOgwo35V9vAgVynSTp1xbqhEgvtWo=; b=atWN7XspaZT6j4s6Ja0R9UGrLI6ntDHRjs3ALPzKWIef1GIdhFgJS5ipMUGMZ6mrD3vBvq UIiSKyefiU0XL7UAW/YzWPHwDQRFycC/0Qx+5OxXY67mpI4xN9mrRVCZl0TfH7+HSzOdMh qgS2KbPk3Q7cJcd//HsictylmgG2ACfttFROt8WAbXg+H8GDy26ygRWzc2IXowk1ksk91Q KbWyuoePRkhEgbyARQxJk3sP9AkvLQS9u8CagYcPhVDoN4fws84oMHcvw/n5COHmN4lwWH mqJ5yMEnJAj53TTKrlmqeH6ytUdAXJfqHtFmasDoGQU/+HhncGgiF/J0cZt6CA== 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 E22F025A3A; Fri, 17 Jun 2022 19:38:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25HJcFrx014448; Fri, 17 Jun 2022 19:38:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJcFhx014447; Fri, 17 Jun 2022 19:38:15 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:38:15 GMT Message-Id: <202206171938.25HJcFhx014447@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: e5a000ff5afa - stable/13 - linux: make PTRACE_GETREGS return correct struct 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e5a000ff5afa8b8e4043284f2419b4042d06667c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494696; 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=4vjJ1SlCtjpV0mwOgwo35V9vAgVynSTp1xbqhEgvtWo=; b=ZWD2MUnO645qHtceGXfZdLGQD03u5n5Wwdl4OKguJxQYXlftFuvFqU2R79fxeHhH3OTsGE 43D91LMU67Hb2Aw7CL4d7ltIkwZ4fuROPZscyP9J9x/QR2kcYYsEGA2SGgWxhoHeNkQERb glUiyNizVdVOjFgHXsazbPPU0TRMHFUjwhzrLelgw0N/mRpONrx5o7tWxRCxZkBFnFHRx1 rbJ05grwYAg8BvQFsx6HhG+D/O6WbKxGarA2eX4S37FzYWt/RH4eRyS8PHPdhxYLJtfrdB NXL10OaPMhnC1KVfV3wlz0tsIHQWVw1XJp8Dgu+OPEKRjFmCXaQR2H91JT392w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494696; a=rsa-sha256; cv=none; b=gYORwMNI9wrX4orDm/WdzCdNgdFf9OwcX4OnIiZhqjPkiVu4YO3fIWx4wrphDAiIR3PRon e3ia+Aegptbm4M92Xt5M7R2FFu1KtVN6cYK7ZZ5Au+LUFFtIbDmEeVySPwRE5kozq9vTNd Hz5bYiiw9aoIOKbRIHe4vjdHCcUHUtxn+Tt/JYsfOKV49RB8fHW8+USAmrD5VxofxqqBgM krN18+/T7hvVpTRlkTaATbWffyEELmcFEqWp0vaiV39cg00Q5ZMwo+78HF677eDXNHuoXW 57HCNWWEOesDj9/ApuD3J8Ul+8F4u0TX8g7Ys09JX++UAyC4PYwz3wIDmpytTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=e5a000ff5afa8b8e4043284f2419b4042d06667c commit e5a000ff5afa8b8e4043284f2419b4042d06667c Author: Edward Tomasz Napierala AuthorDate: 2021-10-29 15:18:13 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:33:34 +0000 linux: make PTRACE_GETREGS return correct struct Previously it returned a shorter struct. I can't find any modern software that uses it, but tests/ptrace from strace(1) repo complained. Differential Revision: https://reviews.freebsd.org/D32601 (cherry picked from commit ad0379660d0c77aaf0ca6ec19472b7bb173c5794) --- sys/amd64/linux/linux_ptrace.c | 62 ++++++++++++------------------------------ 1 file changed, 18 insertions(+), 44 deletions(-) diff --git a/sys/amd64/linux/linux_ptrace.c b/sys/amd64/linux/linux_ptrace.c index 770ebcf58364..ecfe2f7b5818 100644 --- a/sys/amd64/linux/linux_ptrace.c +++ b/sys/amd64/linux/linux_ptrace.c @@ -214,38 +214,6 @@ struct syscall_info { }; }; -/* - * Translate amd64 ptrace registers between Linux and FreeBSD formats. - * The translation is pretty straighforward, for all registers but - * orig_rax on Linux side and r_trapno and r_err in FreeBSD. - */ -static void -map_regs_to_linux(struct reg *b_reg, struct linux_pt_reg *l_reg) -{ - - l_reg->r15 = b_reg->r_r15; - l_reg->r14 = b_reg->r_r14; - l_reg->r13 = b_reg->r_r13; - l_reg->r12 = b_reg->r_r12; - l_reg->rbp = b_reg->r_rbp; - l_reg->rbx = b_reg->r_rbx; - l_reg->r11 = b_reg->r_r11; - l_reg->r10 = b_reg->r_r10; - l_reg->r9 = b_reg->r_r9; - l_reg->r8 = b_reg->r_r8; - l_reg->rax = b_reg->r_rax; - l_reg->rcx = b_reg->r_rcx; - l_reg->rdx = b_reg->r_rdx; - l_reg->rsi = b_reg->r_rsi; - l_reg->rdi = b_reg->r_rdi; - l_reg->orig_rax = b_reg->r_rax; - l_reg->rip = b_reg->r_rip; - l_reg->cs = b_reg->r_cs; - l_reg->eflags = b_reg->r_rflags; - l_reg->rsp = b_reg->r_rsp; - l_reg->ss = b_reg->r_ss; -} - static void map_regs_from_linux(struct reg *b_reg, struct linux_pt_reg *l_reg) { @@ -434,14 +402,21 @@ linux_ptrace_getregs(struct thread *td, pid_t pid, void *data) { struct ptrace_lwpinfo lwpinfo; struct reg b_reg; - struct linux_pt_reg l_reg; + struct linux_pt_regset l_regset; + struct pcb *pcb; int error; error = kern_ptrace(td, PT_GETREGS, pid, &b_reg, 0); if (error != 0) return (error); - map_regs_to_linux(&b_reg, &l_reg); + pcb = td->td_pcb; + if (td == curthread) + update_pcb_bases(pcb); + + bsd_to_linux_regset(&b_reg, &l_regset); + l_regset.fs_base = pcb->pcb_fsbase; + l_regset.gs_base = pcb->pcb_gsbase; error = kern_ptrace(td, PT_LWPINFO, pid, &lwpinfo, sizeof(lwpinfo)); if (error != 0) { @@ -450,21 +425,20 @@ linux_ptrace_getregs(struct thread *td, pid_t pid, void *data) } if (lwpinfo.pl_flags & PL_FLAG_SCE) { /* - * The strace(1) utility depends on RAX being set to -ENOSYS - * on syscall entry; otherwise it loops printing those: - * - * [ Process PID=928 runs in 64 bit mode. ] - * [ Process PID=928 runs in x32 mode. ] + * Undo the mangling done in exception.S:fast_syscall_common(). */ - l_reg.rax = -38; /* -ENOSYS */ - + l_regset.r10 = l_regset.rcx; + } + if (lwpinfo.pl_flags & (PL_FLAG_SCE | PL_FLAG_SCX)) { /* - * Undo the mangling done in exception.S:fast_syscall_common(). + * In Linux, the syscall number - passed to the syscall + * as rax - is preserved in orig_rax; rax gets overwritten + * with syscall return value. */ - l_reg.r10 = l_reg.rcx; + l_regset.orig_rax = lwpinfo.pl_syscall_code; } - error = copyout(&l_reg, (void *)data, sizeof(l_reg)); + error = copyout(&l_regset, (void *)data, sizeof(l_regset)); return (error); }