[src/trunk]: src/sys/rump/librump/rumpkern Implement poor man's (or woman's) ...

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

details:   https://anonhg.NetBSD.org/src/rev/d1bb11ff1553
branches:  trunk
changeset: 756327:d1bb11ff1553
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Jul 12 21:00:47 2010 +0000

description:
Implement poor man's (or woman's) fault handler (or handlim).

from Stan (or Loretta)

diffstat:

 sys/rump/librump/rumpkern/rumpcopy.c |  18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diffs (50 lines):

diff -r 6329e2671937 -r d1bb11ff1553 sys/rump/librump/rumpkern/rumpcopy.c
--- a/sys/rump/librump/rumpkern/rumpcopy.c      Mon Jul 12 16:08:52 2010 +0000
+++ b/sys/rump/librump/rumpkern/rumpcopy.c      Mon Jul 12 21:00:47 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rumpcopy.c,v 1.3 2010/06/10 21:40:42 pooka Exp $       */
+/*     $NetBSD: rumpcopy.c,v 1.4 2010/07/12 21:00:47 pooka Exp $       */
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpcopy.c,v 1.3 2010/06/10 21:40:42 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpcopy.c,v 1.4 2010/07/12 21:00:47 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/lwp.h>
@@ -40,10 +40,13 @@
 copyin(const void *uaddr, void *kaddr, size_t len)
 {
 
-       if (curproc->p_vmspace == &vmspace0)
+       if (curproc->p_vmspace == &vmspace0) {
+               if (uaddr == NULL)
+                       return EFAULT;
                memcpy(kaddr, uaddr, len);
-       else
+       } else {
                rump_sysproxy_copyin(uaddr, kaddr, len);
+       }
        return 0;
 }
 
@@ -51,10 +54,13 @@
 copyout(const void *kaddr, void *uaddr, size_t len)
 {
 
-       if (curproc->p_vmspace == &vmspace0)
+       if (curproc->p_vmspace == &vmspace0) {
+               if (uaddr == NULL)
+                       return EFAULT;
                memcpy(uaddr, kaddr, len);
-       else
+       } else {
                rump_sysproxy_copyout(kaddr, uaddr, len);
+       }
        return 0;
 }