From owner-svn-src-stable-12@freebsd.org Sun Aug 23 19:30:15 2020 Return-Path: Delivered-To: svn-src-stable-12@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 435713C5A99; Sun, 23 Aug 2020 19:30:15 +0000 (UTC) (envelope-from trasz@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BZQMB2nmrz41xP; Sun, 23 Aug 2020 19:30:13 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 43DF8C4BF; Sun, 23 Aug 2020 19:30:13 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07NJUDqU062913; Sun, 23 Aug 2020 19:30:13 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07NJUD6e062912; Sun, 23 Aug 2020 19:30:13 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <202008231930.07NJUD6e062912@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Sun, 23 Aug 2020 19:30:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r364510 - stable/12/sys/amd64/linux X-SVN-Group: stable-12 X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: stable/12/sys/amd64/linux X-SVN-Commit-Revision: 364510 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Aug 2020 19:30:17 -0000 Author: trasz Date: Sun Aug 23 19:30:12 2020 New Revision: 364510 URL: https://svnweb.freebsd.org/changeset/base/364510 Log: MFC r351821: Improve debugging output. Sponsored by: The FreeBSD Foundation Modified: stable/12/sys/amd64/linux/linux_ptrace.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/amd64/linux/linux_ptrace.c ============================================================================== --- stable/12/sys/amd64/linux/linux_ptrace.c Sun Aug 23 19:30:06 2020 (r364509) +++ stable/12/sys/amd64/linux/linux_ptrace.c Sun Aug 23 19:30:12 2020 (r364510) @@ -319,6 +319,22 @@ linux_ptrace_peek(struct thread *td, pid_t pid, void * } static int +linux_ptrace_peekuser(struct thread *td, pid_t pid, void *addr, void *data) +{ + + linux_msg(td, "PTRACE_PEEKUSER not implemented; returning EINVAL"); + return (EINVAL); +} + +static int +linux_ptrace_pokeuser(struct thread *td, pid_t pid, void *addr, void *data) +{ + + linux_msg(td, "PTRACE_POKEUSER not implemented; returning EINVAL"); + return (EINVAL); +} + +static int linux_ptrace_setoptions(struct thread *td, pid_t pid, l_ulong data) { struct linux_pemuldata *pem; @@ -566,11 +582,17 @@ linux_ptrace(struct thread *td, struct linux_ptrace_ar error = linux_ptrace_peek(td, pid, (void *)(uap->addr + 4), (void *)(uap->data + 4)); break; + case LINUX_PTRACE_PEEKUSER: + 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; case LINUX_PTRACE_POKEDATA: error = kern_ptrace(td, PT_WRITE_D, pid, addr, uap->data); + break; + case LINUX_PTRACE_POKEUSER: + error = linux_ptrace_pokeuser(td, pid, addr, (void *)uap->data); break; case LINUX_PTRACE_CONT: error = map_signum(uap->data, &sig);