diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-07-09 23:48:09 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-07-09 23:48:09 +0000 |
| commit | 8487bfead728e4b8f4a3c4da548f6be46adcf4f6 (patch) | |
| tree | 9fc81e61d63b428f0c8932b318df1e1346231bf8 /sys/arch/m88k | |
| parent | 98a810357d71084a83deacf946c01fc9e6a0d306 (diff) | |
I wrote the pc-page-writeable and sp-not-MAP_STACK code to be shared, and
then ran into the messaging being poor. Then I fixed the messages. But
there are two sub-cases of sp-not-MAP_STACK -- one at syscall time, and
another at regular userland trap (on some architectures), and I bungled
that messaging. Correct that now, while I look for yet another better way...
discovered by millert, who ran an pre-MAP_STACK binary.
Diffstat (limited to 'sys/arch/m88k')
| -rw-r--r-- | sys/arch/m88k/m88k/trap.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/arch/m88k/m88k/trap.c b/sys/arch/m88k/m88k/trap.c index db3575b15fa..4b2d6a8f7e1 100644 --- a/sys/arch/m88k/m88k/trap.c +++ b/sys/arch/m88k/m88k/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.108 2019/06/17 19:04:40 deraadt Exp $ */ +/* $OpenBSD: trap.c,v 1.109 2019/07/09 23:48:08 deraadt Exp $ */ /* * Copyright (c) 2004, Miodrag Vallat. * Copyright (c) 1998 Steve Murphree, Jr. @@ -239,7 +239,8 @@ m88100_trap(u_int type, struct trapframe *frame) type += T_USER; p->p_md.md_tf = frame; /* for ptrace/signals */ refreshcreds(p); - if (!uvm_map_inentry(p, &p->p_spinentry, PROC_STACK(p), "sp", + if (!uvm_map_inentry(p, &p->p_spinentry, PROC_STACK(p), + "[%s]%d/%d sp=%lx inside %lx-%lx: not MAP_STACK\n", uvm_map_inentry_sp, p->p_vmspace->vm_map.sserial)) return; } @@ -682,7 +683,8 @@ m88110_trap(u_int type, struct trapframe *frame) type += T_USER; p->p_md.md_tf = frame; /* for ptrace/signals */ refreshcreds(p); - if (!uvm_map_inentry(p, &p->p_spinentry, PROC_STACK(p), "sp", + if (!uvm_map_inentry(p, &p->p_spinentry, PROC_STACK(p), + "[%s]%d/%d sp=%lx inside %lx-%lx: not MAP_STACK\n", uvm_map_inentry_sp, p->p_vmspace->vm_map.sserial)) return; } |