fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / um / kernel / tt / uaccess_user.c

diff --git a/arch/um/kernel/tt/uaccess_user.c b/arch/um/kernel/tt/uaccess_user.c
index 537ee9f..ed1abcf 100644 (file)
--- a/arch/um/kernel/tt/uaccess_user.c
+++ b/arch/um/kernel/tt/uaccess_user.c
@@ -4,21 +4,34 @@
  * Licensed under the GPL
  */
 
-#include <setjmp.h>
 #include <string.h>
 #include "user_util.h"
 #include "uml_uaccess.h"
+#include "task.h"
+#include "kern_util.h"
+#include "os.h"
+#include "longjmp.h"
 
 int __do_copy_from_user(void *to, const void *from, int n,
                        void **fault_addr, void **fault_catcher)
 {
+       struct tt_regs save = TASK_REGS(get_current())->tt;
        unsigned long fault;
        int faulted;
 
        fault = __do_user_copy(to, from, n, fault_addr, fault_catcher,
                               __do_copy, &faulted);
-       if(!faulted) return(0);
-       else return(n - (fault - (unsigned long) from));
+       TASK_REGS(get_current())->tt = save;
+
+       if(!faulted)
+               return 0;
+       else if (fault)
+               return n - (fault - (unsigned long) from);
+       else
+               /* In case of a general protection fault, we don't have the
+                * fault address, so NULL is used instead. Pretend we didn't
+                * copy anything. */
+               return n;
 }
 
 static void __do_strncpy(void *dst, const void *src, int count)
@@ -29,11 +42,14 @@ static void __do_strncpy(void *dst, const void *src, int count)
 int __do_strncpy_from_user(char *dst, const char *src, unsigned long count,
                           void **fault_addr, void **fault_catcher)
 {
+       struct tt_regs save = TASK_REGS(get_current())->tt;
        unsigned long fault;
        int faulted;
 
        fault = __do_user_copy(dst, src, count, fault_addr, fault_catcher,
                               __do_strncpy, &faulted);
+       TASK_REGS(get_current())->tt = save;
+
        if(!faulted) return(strlen(dst));
        else return(-1);
 }
@@ -46,11 +62,14 @@ static void __do_clear(void *to, const void *from, int n)
 int __do_clear_user(void *mem, unsigned long len,
                    void **fault_addr, void **fault_catcher)
 {
+       struct tt_regs save = TASK_REGS(get_current())->tt;
        unsigned long fault;
        int faulted;
 
        fault = __do_user_copy(mem, NULL, len, fault_addr, fault_catcher,
                               __do_clear, &faulted);
+       TASK_REGS(get_current())->tt = save;
+
        if(!faulted) return(0);
        else return(len - (fault - (unsigned long) mem));
 }
@@ -58,19 +77,20 @@ int __do_clear_user(void *mem, unsigned long len,
 int __do_strnlen_user(const char *str, unsigned long n,
                      void **fault_addr, void **fault_catcher)
 {
+       struct tt_regs save = TASK_REGS(get_current())->tt;
        int ret;
        unsigned long *faddrp = (unsigned long *)fault_addr;
        jmp_buf jbuf;
 
        *fault_catcher = &jbuf;
-       if(setjmp(jbuf) == 0){
+       if(UML_SETJMP(&jbuf) == 0)
                ret = strlen(str) + 1;
-       } 
-       else {
-               ret = *faddrp - (unsigned long) str;
-       }
+       else ret = *faddrp - (unsigned long) str;
+
        *fault_addr = NULL;
        *fault_catcher = NULL;
+
+       TASK_REGS(get_current())->tt = save;
        return ret;
 }