Sat Aug 27 17:57:14 2011 UTC ()

Fix copystring routines to NOT just copy all since not all space might be
writable. This can be fixed by implementing/importing strnlen(3) in the kernel
and/or for NetBSD/usermode to have onfaults in the copyins/copyouts.


(reinoud)

diff -r1.4 -r1.5 src/sys/arch/usermode/usermode/copy.c

--- src/sys/arch/usermode/usermode/copy.c 2011/08/25 19:07:45	1.4
+++ src/sys/arch/usermode/usermode/copy.c 2011/08/27 17:57:14	1.5

 @@ -1,14 +1,14 @@
-/* $NetBSD: copy.c,v 1.4 2011/08/25 19:07:45 reinoud Exp $ */
+/* $NetBSD: copy.c,v 1.5 2011/08/27 17:57:14 reinoud Exp $ */
 /*-
  * Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,74 +17,77 @@
  * ``AS IS'' AND 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 THE FOUNDATION OR CONTRIBUTORS
  * 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: copy.c,v 1.4 2011/08/25 19:07:45 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: copy.c,v 1.5 2011/08/27 17:57:14 reinoud Exp $");
 #include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/param.h>		// tmp
-#include <uvm/uvm.h>		// tmp
+/* XXX until strnlen(3) has been added to the kernel, we *could* panic on it */
-#include <uvm/uvm_pmap.h>	// tmp
+#define strnlen(str, maxlen) min(strlen((str)), maxlen)
 int
 copyin(const void *uaddr, void *kaddr, size_t len)
+{
 	aprint_debug("copyin uaddr %p, kaddr %p, len %d\n", uaddr, kaddr, (int) len);
 	memcpy(kaddr, uaddr, len);
 	return 0;
+}
 int
 copyout(const void *kaddr, void *uaddr, size_t len)
+{
 	aprint_debug("copyout kaddr %p, uaddr %p, len %d\n", kaddr, uaddr, (int) len);
 	memcpy(uaddr, kaddr, len);
 	return 0;
+}
 int
 copyinstr(const void *uaddr, void *kaddr, size_t len, size_t *done)
+{
 	len = min(strnlen(uaddr, len), len) + 1;
 	strncpy(kaddr, uaddr, len);
 	if (done)
-		*done = min(strlen(uaddr), len);
+		*done = len;
 	return 0;
+}
 int
 copyoutstr(const void *kaddr, void *uaddr, size_t len, size_t *done)
+{
 	len = min(strnlen(kaddr, len), len) + 1;
 	strncpy(uaddr, kaddr, len);
 	if (done)
-		*done = min(strlen(kaddr), len);
+		*done = len;
 	return 0;
+}
 int
 copystr(const void *kfaddr, void *kdaddr, size_t len, size_t *done)
+{
 	len = min(strnlen(kfaddr, len), len) + 1;
 	strncpy(kdaddr, kfaddr, len);
 	if (done)
-		*done = min(strlen(kfaddr), len);
+		*done = len;
 	return 0;
+}
 int
 kcopy(const void *src, void *dst, size_t len)
+{
 	memcpy(dst, src, len);
 #ifdef DEBUG
 	if (memcmp(dst, src, len) != 0)
 		panic("kcopy not finished correctly\n");
 #endif
 	return 0;
+}