Module Name: src Committed By: martin Date: Sun Nov 24 08:15:17 UTC 2019
Modified Files: src/sys/kern [netbsd-8]: sys_ptrace_common.c Log Message: Pull up following revision(s) (requested by rin in ticket #1456): sys/kern/sys_ptrace_common.c: revision 1.73 Fix regression introduced to ptrace_regs() in rev 1.27: http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/kern/sys_ptrace_common.c#rev1.27 Size of registers should be determined from tracer, NOT tracee. Now, 64-bit tracer can manipulate registers of 32-bit tracee again. gdb for amd64 works for i386 binaries to some extent. XXX pullup to netbsd-9 and -8. To generate a diff of this commit: cvs rdiff -u -r1.22.2.7 -r1.22.2.8 src/sys/kern/sys_ptrace_common.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/kern/sys_ptrace_common.c diff -u src/sys/kern/sys_ptrace_common.c:1.22.2.7 src/sys/kern/sys_ptrace_common.c:1.22.2.8 --- src/sys/kern/sys_ptrace_common.c:1.22.2.7 Tue Nov 19 10:50:25 2019 +++ src/sys/kern/sys_ptrace_common.c Sun Nov 24 08:15:17 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sys_ptrace_common.c,v 1.22.2.7 2019/11/19 10:50:25 martin Exp $ */ +/* $NetBSD: sys_ptrace_common.c,v 1.22.2.8 2019/11/24 08:15:17 martin Exp $ */ /*- * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. @@ -118,7 +118,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sys_ptrace_common.c,v 1.22.2.7 2019/11/19 10:50:25 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sys_ptrace_common.c,v 1.22.2.8 2019/11/24 08:15:17 martin Exp $"); #ifdef _KERNEL_OPT #include "opt_ptrace.h" @@ -775,9 +775,12 @@ ptrace_regs(struct lwp *l, struct lwp ** void *addr, size_t data) { int error; - struct proc *t = (*lt)->l_proc; + struct proc *p, *t; struct vmspace *vm; + p = l->l_proc; /* tracer */ + t = (*lt)->l_proc; /* traced */ + if ((error = ptrace_update_lwp(t, lt, data)) != 0) return error; @@ -791,7 +794,7 @@ ptrace_regs(struct lwp *l, struct lwp ** case_PT_SETREGS if (!process_validregs(*lt)) return EINVAL; - size = PROC_REGSZ(t); + size = PROC_REGSZ(p); func = ptm->ptm_doregs; break; #endif @@ -800,7 +803,7 @@ ptrace_regs(struct lwp *l, struct lwp ** case_PT_SETFPREGS if (!process_validfpregs(*lt)) return EINVAL; - size = PROC_FPREGSZ(t); + size = PROC_FPREGSZ(p); func = ptm->ptm_dofpregs; break; #endif @@ -809,7 +812,7 @@ ptrace_regs(struct lwp *l, struct lwp ** case_PT_SETDBREGS if (!process_validdbregs(*lt)) return EINVAL; - size = PROC_DBREGSZ(t); + size = PROC_DBREGSZ(p); func = ptm->ptm_dodbregs; break; #endif