summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorguenther <guenther@openbsd.org>2016-10-19 08:23:37 +0000
committerguenther <guenther@openbsd.org>2016-10-19 08:23:37 +0000
commitf764f17bd112585cf34d54c83d00513f98c9e150 (patch)
treebe113f12e9eea2d44008b4dc05aa832e6e710ecf
parentMove session-create hook out of session_create so it works with grouped sessions. (diff)
downloadwireguard-openbsd-f764f17bd112585cf34d54c83d00513f98c9e150.tar.xz
wireguard-openbsd-f764f17bd112585cf34d54c83d00513f98c9e150.zip
The first argument to process_domem() and its uio_procp should be curproc
ok kettenis@
-rw-r--r--sys/arch/alpha/alpha/process_machdep.c10
-rw-r--r--sys/arch/mips64/mips64/trap.c10
2 files changed, 10 insertions, 10 deletions
diff --git a/sys/arch/alpha/alpha/process_machdep.c b/sys/arch/alpha/alpha/process_machdep.c
index 6fe711eb74a..86d3874dd05 100644
--- a/sys/arch/alpha/alpha/process_machdep.c
+++ b/sys/arch/alpha/alpha/process_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: process_machdep.c,v 1.12 2014/01/26 17:40:09 miod Exp $ */
+/* $OpenBSD: process_machdep.c,v 1.13 2016/10/19 08:23:37 guenther Exp $ */
/* $NetBSD: process_machdep.c,v 1.7 1996/07/11 20:14:21 cgd Exp $ */
/*-
@@ -180,8 +180,8 @@ ptrace_read_int(struct proc *p, vaddr_t addr, u_int32_t *v)
uio.uio_resid = sizeof(u_int32_t);
uio.uio_segflg = UIO_SYSSPACE;
uio.uio_rw = UIO_READ;
- uio.uio_procp = p;
- return process_domem(curproc, p, &uio, PT_READ_I);
+ uio.uio_procp = curproc;
+ return process_domem(curproc, p->p_p, &uio, PT_READ_I);
}
int
@@ -198,8 +198,8 @@ ptrace_write_int(struct proc *p, vaddr_t addr, u_int32_t v)
uio.uio_resid = sizeof(u_int32_t);
uio.uio_segflg = UIO_SYSSPACE;
uio.uio_rw = UIO_WRITE;
- uio.uio_procp = p;
- return process_domem(curproc, p, &uio, PT_WRITE_I);
+ uio.uio_procp = curproc;
+ return process_domem(curproc, p->p_p, &uio, PT_WRITE_I);
}
u_int64_t
diff --git a/sys/arch/mips64/mips64/trap.c b/sys/arch/mips64/mips64/trap.c
index 2365c1c1eed..ca67ccbebba 100644
--- a/sys/arch/mips64/mips64/trap.c
+++ b/sys/arch/mips64/mips64/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.119 2016/10/08 05:49:09 guenther Exp $ */
+/* $OpenBSD: trap.c,v 1.120 2016/10/19 08:23:37 guenther Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -1031,8 +1031,8 @@ ptrace_read_insn(struct proc *p, vaddr_t va, uint32_t *insn)
uio.uio_resid = sizeof(uint32_t);
uio.uio_segflg = UIO_SYSSPACE;
uio.uio_rw = UIO_READ;
- uio.uio_procp = p;
- return process_domem(p, p, &uio, PT_READ_I);
+ uio.uio_procp = curproc;
+ return process_domem(curproc, p->p_p, &uio, PT_READ_I);
}
int
@@ -1049,8 +1049,8 @@ ptrace_write_insn(struct proc *p, vaddr_t va, uint32_t insn)
uio.uio_resid = sizeof(uint32_t);
uio.uio_segflg = UIO_SYSSPACE;
uio.uio_rw = UIO_WRITE;
- uio.uio_procp = p;
- return process_domem(p, p, &uio, PT_WRITE_I);
+ uio.uio_procp = curproc;
+ return process_domem(curproc, p->p_p, &uio, PT_WRITE_I);
}
/*