diff options
| author |   drahn <drahn@openbsd.org> | 2001-09-20 13:46:04 +0000 |
|---|---|---|
| committer | drahn <drahn@openbsd.org> | 2001-09-20 13:46:04 +0000 |
| commit | 671cb9a32cad3b63fce4bb2821ed0a600fefb498 (patch) | |
| tree | 032835bd04b6f5042c3a537c96958fb6eb8eb7a4 | |
| parent | On a fault the onfault condition should be set to the old handler, not (diff) | |
| download | wireguard-openbsd-671cb9a32cad3b63fce4bb2821ed0a600fefb498.tar.xz wireguard-openbsd-671cb9a32cad3b63fce4bb2821ed0a600fefb498.zip | |
Allow nesting of fault handlers by saving old onfault handler and
restoring it when the copying/copyout/badaddr functions finish.
| -rw-r--r-- | sys/arch/powerpc/powerpc/trap.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/sys/arch/powerpc/powerpc/trap.c b/sys/arch/powerpc/powerpc/trap.c index a310741c766..5cad508fb23 100644 --- a/sys/arch/powerpc/powerpc/trap.c +++ b/sys/arch/powerpc/powerpc/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.32 2001/09/19 20:50:57 mickey Exp $ */ +/* $OpenBSD: trap.c,v 1.33 2001/09/20 13:46:04 drahn Exp $ */ /* $NetBSD: trap.c,v 1.3 1996/10/13 03:31:37 christos Exp $ */ /* @@ -497,9 +497,10 @@ badaddr(addr, len) { faultbuf env; u_int32_t v; + register void *oldh = curpcb->pcb_onfault; if (setfault(env)) { - curpcb->pcb_onfault = 0; + curpcb->pcb_onfault = oldh; return EFAULT; } switch(len) { @@ -513,7 +514,7 @@ badaddr(addr, len) v = *((volatile u_int8_t *)addr); break; } - curpcb->pcb_onfault = 0; + curpcb->pcb_onfault = oldh; return(0); } @@ -526,9 +527,10 @@ copyin(udaddr, kaddr, len) void *p; size_t l; faultbuf env; + register void *oldh = curpcb->pcb_onfault; if (setfault(env)) { - curpcb->pcb_onfault = 0; + curpcb->pcb_onfault = oldh; return EFAULT; } while (len > 0) { @@ -542,7 +544,7 @@ copyin(udaddr, kaddr, len) kaddr += l; len -= l; } - curpcb->pcb_onfault = 0; + curpcb->pcb_onfault = oldh; return 0; } @@ -555,9 +557,10 @@ copyout(kaddr, udaddr, len) void *p; size_t l; faultbuf env; + register void *oldh = curpcb->pcb_onfault; if (setfault(env)) { - curpcb->pcb_onfault = 0; + curpcb->pcb_onfault = oldh; return EFAULT; } while (len > 0) { @@ -571,7 +574,7 @@ copyout(kaddr, udaddr, len) kaddr += l; len -= l; } - curpcb->pcb_onfault = 0; + curpcb->pcb_onfault = oldh; return 0; } |