CVS commit: src/sys/rump/librump/rumpkern

[Antti Kantee]

Module Name:    src
Committed By:   pooka
Date:           Sun Jul 18 12:44:31 UTC 2010

Modified Files:
        src/sys/rump/librump/rumpkern: rumpcopy.c

Log Message:
Ignore errors when copyin/out len == 0.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/librump/rumpkern/rumpcopy.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/rump/librump/rumpkern/rumpcopy.c
diff -u src/sys/rump/librump/rumpkern/rumpcopy.c:1.4 src/sys/rump/librump/rumpkern/rumpcopy.c:1.5
--- src/sys/rump/librump/rumpkern/rumpcopy.c:1.4	Mon Jul 12 21:00:47 2010
+++ src/sys/rump/librump/rumpkern/rumpcopy.c	Sun Jul 18 12:44:31 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpcopy.c,v 1.4 2010/07/12 21:00:47 pooka Exp $	*/
+/*	$NetBSD: rumpcopy.c,v 1.5 2010/07/18 12:44:31 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.4 2010/07/12 21:00:47 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpcopy.c,v 1.5 2010/07/18 12:44:31 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/lwp.h>
@@ -41,8 +41,9 @@
 {
 
 	if (curproc->p_vmspace == &vmspace0) {
-		if (uaddr == NULL)
+		if (__predict_false(uaddr == NULL && len)) {
 			return EFAULT;
+		}
 		memcpy(kaddr, uaddr, len);
 	} else {
 		rump_sysproxy_copyin(uaddr, kaddr, len);
@@ -55,8 +56,9 @@
 {
 
 	if (curproc->p_vmspace == &vmspace0) {
-		if (uaddr == NULL)
+		if (__predict_false(uaddr == NULL && len)) {
 			return EFAULT;
+		}
 		memcpy(uaddr, kaddr, len);
 	} else {
 		rump_sysproxy_copyout(kaddr, uaddr, len);