From 1767898469a83dc29d5a64fd5e9e582ce7dca107 Mon Sep 17 00:00:00 2001
From: Ted Unangst <tedu@cvs.openbsd.org>
Date: Sun, 17 Apr 2005 07:33:14 +0000
Subject: make sure user address is in user space in copyinstr.  ok weingart@

---
 sys/arch/i386/i386/locore.s | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys/arch/i386/i386/locore.s b/sys/arch/i386/i386/locore.s
index bf53884d22c..5254c3e7932 100644
--- a/sys/arch/i386/i386/locore.s
+++ b/sys/arch/i386/i386/locore.s
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.s,v 1.82 2005/02/10 04:06:01 weingart Exp $	*/
+/*	$OpenBSD: locore.s,v 1.83 2005/04/17 07:33:13 tedu Exp $	*/
 /*	$NetBSD: locore.s,v 1.145 1996/05/03 19:41:19 christos Exp $	*/
 
 /*-
@@ -1298,6 +1298,8 @@ ENTRY(copyinstr)
 
 1:	decl	%edx
 	jz	2f
+	cmpl    $VM_MAXUSER_ADDRESS,%esi
+	jae     _C_LABEL(copystr_fault)
 	lodsb
 	stosb
 	testb	%al,%al
-- 
cgit v1.2.3