diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-09-06 12:22:02 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-09-06 12:22:02 +0000 |
| commit | f3b5414816d1323fb952a52969123786b389a6c0 (patch) | |
| tree | 94a58359d3b32ff709692b3416cc02854b17e8fa /sys/arch/powerpc | |
| parent | 7cc0269c59f408ccac1b47fb15af749a306bc71b (diff) | |
If uvm_map_inentry returns false then a signal has been delivered, and
userret() must be called on trap() exit to deliver it, rather than
repeating the same cause infinitely. discovered by George Koehler
ok kettenis bluhm visa
Diffstat (limited to 'sys/arch/powerpc')
| -rw-r--r-- | sys/arch/powerpc/powerpc/trap.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/arch/powerpc/powerpc/trap.c b/sys/arch/powerpc/powerpc/trap.c index e7b39f3191b..2f0b218ba6c 100644 --- a/sys/arch/powerpc/powerpc/trap.c +++ b/sys/arch/powerpc/powerpc/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.110 2019/07/20 23:03:55 mpi Exp $ */ +/* $OpenBSD: trap.c,v 1.111 2019/09/06 12:22:01 deraadt Exp $ */ /* $NetBSD: trap.c,v 1.3 1996/10/13 03:31:37 christos Exp $ */ /* @@ -239,7 +239,7 @@ trap(struct trapframe *frame) 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; + goto out; } switch (type) { @@ -612,6 +612,7 @@ for (i = 0; i < errnum; i++) { break; } +out: userret(p); finish: |