 @@ -1,14 +1,14 @@
-/*	$NetBSD: copyinstr.c,v 1.9 2010/03/20 23:31:29 chs Exp $	*/
+/*	$NetBSD: copyinstr.c,v 1.9.64.1 2020/03/09 11:52:14 martin Exp $	*/
 /*
  * Copyright 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Eduardo Horvath and Simon Burge for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -26,73 +26,80 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: copyinstr.c,v 1.9 2010/03/20 23:31:29 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: copyinstr.c,v 1.9.64.1 2020/03/09 11:52:14 martin Exp $");
 #include <sys/param.h>
 #include <uvm/uvm_extern.h>
 #include <machine/pcb.h>
 int
 copyinstr(const void *udaddr, void *kaddr, size_t len, size_t *done)
+{
 	struct pmap *pm = curproc->p_vmspace->vm_map.pmap;
-	int rv, msr, pid, tmp, ctx;
+	size_t resid;
 	int rv, msr, pid, data, ctx;
 	struct faultbuf env;
 	if (__predict_false(len == 0)) {
 		if (done)
 			*done = 0;
 		return 0;
+	}
 	if ((rv = setfault(&env))) {
 		curpcb->pcb_onfault = NULL;
 		/* XXXX -- len may be lost on a fault */
 		if (done)
-			*done = len;
+			*done = 0;
 		return rv;
+	}
 	if (!(ctx = pm->pm_ctx)) {
 		/* No context -- assign it one */
 		ctx_alloc(pm);
 		ctx = pm->pm_ctx;
+	}
-	if (len) {
+	resid = len;
-		__asm volatile("mtctr %3;"		/* Set up counter */
+	__asm volatile(
-			"mfmsr %0;"			/* Save MSR */
+		"mtctr %3;"			/* Set up counter */
-			"li %1,0x20; "
+		"mfmsr %0;"			/* Save MSR */
-			"andc %1,%0,%1; mtmsr %1;"	/* Disable IMMU */
+		"li %1,0x20;"
-			"mfpid %1;"			/* Save old PID */
+		"andc %1,%0,%1; mtmsr %1;"	/* Disable IMMU */
-			"sync; isync;"
+		"mfpid %1;"			/* Save old PID */
 		"sync; isync;"
 			"li %3,0;"			/* Clear len */
 		"1: "
-			"1: "
+		"mtpid %4; sync;"		/* Load user ctx */
-			"mtpid %4; sync;"		/* Load user ctx */
+		"lbz %2,0(%5); addi %5,%5,1;"	/* Load byte */
-			"lbz %2,0(%5); addi %5,%5,1;"	/* Load byte */
+		"sync; isync;"
-			"sync; isync;"
+		"mtpid %1; sync;"
-			"mtpid %1;sync;"
+		"stb %2,0(%6); dcbst 0,%6; addi %6,%6,1;"
-			"stb %2,0(%6);  dcbf 0,%6; addi %6,%6,1;"	/* Store kernel byte */
+						/* Store kernel byte */
-			"sync; isync;"
+		"sync; isync;"
-			"addi %3,%3,1;"			/* Inc len */
+		"or. %2,%2,%2;"
-			"or. %2,%2,%2;"
+		"bdnzf 2,1b;"			/* while(ctr-- && !zero) */
 			"bdnzf 2,1b;"			/*
-							 * while(ctr-- && !zero)
+		"mtpid %1; mtmsr %0;"		/* Restore PID, MSR */
-							 */
+		"sync; isync;"
 		"mfctr %3;"			/* Restore resid */
-			"mtpid %1; mtmsr %0;"		/* Restore PID, MSR */
+		: "=&r" (msr), "=&r" (pid), "=&r" (data), "+r" (resid)
-			"sync; isync;"
+		: "r" (ctx), "b" (udaddr), "b" (kaddr));
 			: "=&r" (msr), "=&r" (pid), "=&r" (tmp), "+b" (len)
 			: "r" (ctx), "b" (udaddr), "b" (kaddr));
 	curpcb->pcb_onfault = NULL;
 	if (done)
-		*done = len;
+		*done = len - resid;
-	return 0;
+	if (resid == 0 && (char)data != '\0')
 		return ENAMETOOLONG;
 	else
 		return 0;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: copyoutstr.c,v 1.9 2010/03/20 23:31:29 chs Exp $	*/
+/*	$NetBSD: copyoutstr.c,v 1.9.64.1 2020/03/09 11:52:14 martin Exp $	*/
 /*
  * Copyright 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Eduardo Horvath and Simon Burge for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -26,73 +26,80 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: copyoutstr.c,v 1.9 2010/03/20 23:31:29 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: copyoutstr.c,v 1.9.64.1 2020/03/09 11:52:14 martin Exp $");
 #include <sys/param.h>
 #include <uvm/uvm_extern.h>
 #include <machine/pcb.h>
 int
 copyoutstr(const void *kaddr, void *udaddr, size_t len, size_t *done)
+{
 	struct pmap *pm = curproc->p_vmspace->vm_map.pmap;
-	int rv, msr, pid, tmp, ctx;
+	size_t resid;
 	int rv, msr, pid, data, ctx;
 	struct faultbuf env;
 	if (__predict_false(len == 0)) {
 		if (done)
 			*done = 0;
 		return 0;
+	}
 	if ((rv = setfault(&env))) {
 		curpcb->pcb_onfault = NULL;
 		/* XXXX -- len may be lost on a fault */
 		if (done)
-			*done = len;
+			*done = 0;
 		return rv;
+	}
 	if (!(ctx = pm->pm_ctx)) {
 		/* No context -- assign it one */
 		ctx_alloc(pm);
 		ctx = pm->pm_ctx;
+	}
-	if (len) {
+	resid = len;
-		__asm volatile("mtctr %3;"		/* Set up counter */
+	__asm volatile(
-			"mfmsr %0;"			/* Save MSR */
+		"mtctr %3;"			/* Set up counter */
-			"li %1,0x20; "
+		"mfmsr %0;"			/* Save MSR */
-			"andc %1,%0,%1; mtmsr %1;"	/* Disable IMMU */
+		"li %1,0x20;"
-			"mfpid %1;"			/* Save old PID */
+		"andc %1,%0,%1; mtmsr %1;"	/* Disable IMMU */
-			"sync; isync;"
+		"mfpid %1;"			/* Save old PID */
 		"sync; isync;"
 			"li %3,0;"			/* Clear len */
 		"1:"
-			"1:"
+		"mtpid %1; sync;"
-			"mtpid %1;sync;"
+		"lbz %2,0(%6); addi %6,%6,1;"	/* Store kernel byte */
-			"lbz %2,0(%6); addi %6,%6,1;"	/* Store kernel byte */
+		"sync; isync;"
-			"sync; isync;"
+		"mtpid %4; sync;"		/* Load user ctx */
-			"mtpid %4; sync;"		/* Load user ctx */
+		"stb %2,0(%5); dcbst 0,%5; addi %5,%5,1;"
-			"stb %2,0(%5);  dcbf 0,%5; addi %5,%5,1;"	/* Load byte */
+						/* Load byte */
-			"sync; isync;"
+		"sync; isync;"
-			"addi %3,%3,1;"			/* Inc len */
+		"or. %2,%2,%2;"
-			"or. %2,%2,%2;"
+		"bdnzf 2,1b;"			/* while(ctr-- && !zero) */
 			"bdnzf 2,1b;"			/*
-							 * while(ctr-- && !zero)
+		"mtpid %1; mtmsr %0;"		/* Restore PID, MSR */
-							 */
+		"sync; isync;"
 		"mfctr %3;"			/* Restore resid */
-			"mtpid %1; mtmsr %0;"		/* Restore PID, MSR */
+		: "=&r" (msr), "=&r" (pid), "=&r" (data), "+r" (resid)
-			"sync; isync;"
+		: "r" (ctx), "b" (udaddr), "b" (kaddr));
 			: "=&r" (msr), "=&r" (pid), "=&r" (tmp), "+b" (len)
 			: "r" (ctx), "b" (udaddr), "b" (kaddr));
 	curpcb->pcb_onfault = NULL;
 	if (done)
-		*done = len;
+		*done = len - resid;
-	return 0;
+	if (resid == 0 && (char)data != '\0')
 		return ENAMETOOLONG;
 	else
 		return 0;
+}