From nobody Fri Jun 17 19:38:20 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 8B19785B058; Fri, 17 Jun 2022 19:38: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LPq8X5CVWz3QJ7; Fri, 17 Jun 2022 19:38:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494701; 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=dtjWux8+RGTksFld8wXDF6XSBg89/mLDUgdUTDdR5YQ=; b=A5v9zHJg54yiqPBw0n2Ooq+o95KWLZykNjtCQWrQr9jfz9e4QIHvSXYTEe4wAn8wRutceH CFb7X1JoSyqaf/snSyCIxNWz0wTcofCy6ZQyblztYgllkB+8UK2OZSRCgceplaRx+iKZMa b28iDlQoxRwmrS1OIGJgpRsaCs7o3y8j8DZfhgJ2yRkfPlFdYeY01wSAB1G48NyShwnx8o 7R0MbhVX3vhhSmAjRv6uwj0GzElZxhgYauvdjTwHoTuD51rYpf5lpFSPKRIBOfuuK7ztxX xAIzItmF2QjbGK+ewjHxVPLUeBZeZfu6rMW4vL3RvazRLhb1wvD+l6cyrRTbsw== 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 6FA8125A3C; Fri, 17 Jun 2022 19:38:20 +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 25HJcKwT014551; Fri, 17 Jun 2022 19:38:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJcKRX014550; Fri, 17 Jun 2022 19:38:20 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:38:20 GMT Message-Id: <202206171938.25HJcKRX014550@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: dadf3312b463 - stable/13 - linux: Fix another amd64-specific piece of linux_ptrace.c 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: dadf3312b463e0fa8f7dc45ccc27aa707f56a6b4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494701; 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=dtjWux8+RGTksFld8wXDF6XSBg89/mLDUgdUTDdR5YQ=; b=D59/6FaX3z1rkHGCcm+W8oL7QgzLuMRWye8nTNZCTTchS1qbPiIkDG1CsPduSYWEfA6RHX 1tXinQWNCq++PZh1zGNsn4UFQcjJW+OY3DinL24sLCHupxLAqcnKpmzknVcm8/iaoUXUbu PzVJ+4pcsER8aD3soIRspPNV2+pFpP5AZx/X5nA2Q1m1Dyk96LxDhhOchb+m4ZGz6O2MHY 4z1h3MhoY43t08+5lJt3baLgDmV0gPsHehmAd2Pq6WqMymhOH4bNtFVqYT/swH0+RzuW6/ P3vW+YFEtljmw85YJSc8dd7JMyDZS6aHu/PKZX/XCaUhW40f1vAHkz59VeRvJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494701; a=rsa-sha256; cv=none; b=LVohNVusPh8Cr1c5/uSi7XbDipBotnq7/GByb5FTDQ7SMSPe5TscLUx0m/kQzQn/86V274 0ZumD19lDfZYhYuw7onVDJl+nNI7mLMcjx0VigfTvERlBalEkP1cEOTVfxBvcD6LgnD8m4 /cFX9inVmHQxsRkyY+kGO9xrsYthS/TQr/GMqOZf+GzwS+ORa5qRG8oKupbaMOS/bNHot2 ihZwTBIOw7vdh9ZZIDrCzCmHsFZLUyeXFNks3QIemvJb70In1Qt07Y5p3bTyjypBnLVUzt F6fNjXikth7Hu02DKNkk/MH85f9iEdnjPtSwYmC0she//Bk643AJEqcQA9GT9A== 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=dadf3312b463e0fa8f7dc45ccc27aa707f56a6b4 commit dadf3312b463e0fa8f7dc45ccc27aa707f56a6b4 Author: Edward Tomasz Napierala AuthorDate: 2021-11-06 07:56:51 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:33:36 +0000 linux: Fix another amd64-specific piece of linux_ptrace.c This was missed in c91d0e59be1. No functional changes. Sponsored By: EPSRC (cherry picked from commit 3be6e606d7870a79baa7a4c5947dffd333defa79) --- sys/amd64/linux/linux_ptrace.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/amd64/linux/linux_ptrace.c b/sys/amd64/linux/linux_ptrace.c index a227aa1069eb..c6839d573ad3 100644 --- a/sys/amd64/linux/linux_ptrace.c +++ b/sys/amd64/linux/linux_ptrace.c @@ -41,8 +41,8 @@ __FBSDID("$FreeBSD$"); #include -#include -#include +#include +#include #include #include #include @@ -343,10 +343,10 @@ linux_ptrace_getsiginfo(struct thread *td, pid_t pid, l_ulong data) static int linux_ptrace_getregs(struct thread *td, pid_t pid, void *data) { - struct ptrace_lwpinfo lwpinfo; struct reg b_reg; struct linux_pt_regset l_regset; #ifdef __amd64__ + struct ptrace_lwpinfo lwpinfo; struct pcb *pcb; #endif int error; @@ -364,7 +364,6 @@ linux_ptrace_getregs(struct thread *td, pid_t pid, void *data) l_regset.fs_base = pcb->pcb_fsbase; l_regset.gs_base = pcb->pcb_gsbase; -#endif error = kern_ptrace(td, PT_LWPINFO, pid, &lwpinfo, sizeof(lwpinfo)); if (error != 0) { @@ -385,6 +384,7 @@ linux_ptrace_getregs(struct thread *td, pid_t pid, void *data) */ l_regset.orig_rax = lwpinfo.pl_syscall_code; } +#endif error = copyout(&l_regset, (void *)data, sizeof(l_regset)); return (error); @@ -408,11 +408,11 @@ linux_ptrace_setregs(struct thread *td, pid_t pid, void *data) static int linux_ptrace_getregset_prstatus(struct thread *td, pid_t pid, l_ulong data) { - struct ptrace_lwpinfo lwpinfo; struct reg b_reg; struct linux_pt_regset l_regset; struct iovec iov; #ifdef __amd64__ + struct ptrace_lwpinfo lwpinfo; struct pcb *pcb; #endif size_t len; @@ -437,7 +437,6 @@ linux_ptrace_getregset_prstatus(struct thread *td, pid_t pid, l_ulong data) l_regset.fs_base = pcb->pcb_fsbase; l_regset.gs_base = pcb->pcb_gsbase; -#endif error = kern_ptrace(td, PT_LWPINFO, pid, &lwpinfo, sizeof(lwpinfo)); if (error != 0) { @@ -459,6 +458,7 @@ linux_ptrace_getregset_prstatus(struct thread *td, pid_t pid, l_ulong data) */ l_regset.orig_rax = lwpinfo.pl_syscall_code; } +#endif len = MIN(iov.iov_len, sizeof(l_regset)); error = copyout(&l_regset, (void *)iov.iov_base, len);