From owner-dev-commits-src-main@freebsd.org Tue Jan 19 11:14:58 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 18E074F068C; Tue, 19 Jan 2021 11:14:58 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4DKmJx5MQHz3H5W; Tue, 19 Jan 2021 11:14:57 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.16.1/8.16.1) with ESMTPS id 10JBEhLE047095 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Tue, 19 Jan 2021 13:14:46 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 10JBEhLE047095 Received: (from kostik@localhost) by tom.home (8.16.1/8.16.1/Submit) id 10JBEhHU047094; Tue, 19 Jan 2021 13:14:43 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 19 Jan 2021 13:14:43 +0200 From: Konstantin Belousov To: Edward Tomasz Napierala Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 47f7345baba0 - main - linux: fix PTRACE_POKEDATA and PTRACE_POKETEXT. Message-ID: References: <202101191053.10JArcDa041994@gitrepo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202101191053.10JArcDa041994@gitrepo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on tom.home X-Rspamd-Queue-Id: 4DKmJx5MQHz3H5W X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Jan 2021 11:14:58 -0000 On Tue, Jan 19, 2021 at 10:53:38AM +0000, Edward Tomasz Napierala wrote: > The branch main has been updated by trasz: > > URL: https://cgit.FreeBSD.org/src/commit/?id=47f7345baba01121e29c22b43f68345399a32912 > > commit 47f7345baba01121e29c22b43f68345399a32912 > Author: Edward Tomasz Napierala > AuthorDate: 2021-01-15 16:57:24 +0000 > Commit: Edward Tomasz Napierala > CommitDate: 2021-01-19 10:30:55 +0000 > > linux: fix PTRACE_POKEDATA and PTRACE_POKETEXT. > > Sponsored by: The FreeBSD Foundation > --- > sys/amd64/linux/linux_ptrace.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/sys/amd64/linux/linux_ptrace.c b/sys/amd64/linux/linux_ptrace.c > index a14155ed7e97..c1d05db5bc42 100644 > --- a/sys/amd64/linux/linux_ptrace.c > +++ b/sys/amd64/linux/linux_ptrace.c > @@ -594,10 +594,15 @@ linux_ptrace(struct thread *td, struct linux_ptrace_args *uap) > error = linux_ptrace_peekuser(td, pid, addr, (void *)uap->data); > break; > case LINUX_PTRACE_POKETEXT: > - error = kern_ptrace(td, PT_WRITE_I, pid, addr, uap->data); > - break; This is wrong. You should access text AS if linux request was for text. > case LINUX_PTRACE_POKEDATA: > error = kern_ptrace(td, PT_WRITE_D, pid, addr, uap->data); > + if (error != 0) > + return (error); > + /* > + * Linux expects this syscall to write 64 bits, not 32. > + */ > + error = kern_ptrace(td, PT_WRITE_D, pid, > + (void *)(uap->addr + 4), uap->data >> 32); > break; You should use PT_IO there instead of doing two accesses (to the wrong AS). > case LINUX_PTRACE_POKEUSER: > error = linux_ptrace_pokeuser(td, pid, addr, (void *)uap->data);