[src/trunk]: src/sys/arch/powerpc/powerpc If setfault() returns nonzero (ie, ...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f1dd64e82e10
branches:  trunk
changeset: 571338:f1dd64e82e10
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Nov 18 22:56:32 2004 +0000

description:
If setfault() returns nonzero (ie, we trapped), make sure to unsetusr.

diffstat:

 sys/arch/powerpc/powerpc/trap.c |  20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diffs (66 lines):

diff -r f0bfe08dc293 -r f1dd64e82e10 sys/arch/powerpc/powerpc/trap.c
--- a/sys/arch/powerpc/powerpc/trap.c   Thu Nov 18 22:32:49 2004 +0000
+++ b/sys/arch/powerpc/powerpc/trap.c   Thu Nov 18 22:56:32 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.104 2004/11/18 21:09:37 matt Exp $  */
+/*     $NetBSD: trap.c,v 1.105 2004/11/18 22:56:32 matt Exp $  */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.104 2004/11/18 21:09:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.105 2004/11/18 22:56:32 matt Exp $");
 
 #include "opt_altivec.h"
 #include "opt_ddb.h"
@@ -570,8 +570,10 @@
        struct faultbuf env;
        int rv;
 
-       if ((rv = setfault(&env)) != 0)
+       if ((rv = setfault(&env)) != 0) {
+               unsetusr();
                goto out;
+       }
 
        while (len > 0) {
                size_t seglen;
@@ -598,8 +600,10 @@
        struct faultbuf env;
        int rv;
 
-       if ((rv = setfault(&env)) != 0)
+       if ((rv = setfault(&env)) != 0) {
+               unsetusr();
                goto out;
+       }
 
        while (len > 0) {
                size_t seglen;
@@ -844,8 +848,10 @@
        struct faultbuf env;
        int rv;
 
-       if ((rv = setfault(&env)) != 0)
+       if ((rv = setfault(&env)) != 0) {
+               unsetusr();
                goto out2;
+       }
 
        while (len > 0) {
                size_t seglen;
@@ -881,8 +887,10 @@
        struct faultbuf env;
        int rv;
 
-       if ((rv = setfault(&env)) != 0)
+       if ((rv = setfault(&env)) != 0) {
+               unsetusr();
                goto out2;
+       }
 
        while (len > 0) {
                size_t seglen;