[src/netbsd-2-0]: src/sys/arch/xen/i386 Pull up revision 1.10 (requested by b...

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

details:   https://anonhg.NetBSD.org/src/rev/e597598c155c
branches:  netbsd-2-0
changeset: 564704:e597598c155c
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Mar 16 15:18:53 2005 +0000

description:
Pull up revision 1.10 (requested by bouyer in ticket #1321):
Sync with i386/locore.S 1.33:
Check the passed in address as well as determining the maximum length
using VM_MAXUSER_ADDRESS in copyinstr and copyoutstr.
Problem originally fixed in OpenBSD/i386.
This fix suggested by Charles Hannum (mycroft at netbsd dot org).

diffstat:

 sys/arch/xen/i386/locore.S |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (25 lines):

diff -r 6cde26803d19 -r e597598c155c sys/arch/xen/i386/locore.S
--- a/sys/arch/xen/i386/locore.S        Wed Mar 16 15:11:03 2005 +0000
+++ b/sys/arch/xen/i386/locore.S        Wed Mar 16 15:18:53 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.2.2.3 2005/01/07 15:54:20 jdc Exp $       */
+/*     $NetBSD: locore.S,v 1.2.2.4 2005/03/16 15:18:53 tron Exp $      */
 /*     NetBSD: locore.S,v 1.26 2004/04/12 13:17:46 yamt Exp    */
 
 /*-
@@ -968,6 +968,7 @@
         */
        movl    $VM_MAXUSER_ADDRESS,%eax
        subl    %edi,%eax
+       jc      _C_LABEL(copystr_efault)
        cmpl    %edx,%eax
        jae     1f
        movl    %eax,%edx
@@ -1022,6 +1023,7 @@
         */
        movl    $VM_MAXUSER_ADDRESS,%eax
        subl    %esi,%eax
+       jc      _C_LABEL(copystr_efault)
        cmpl    %edx,%eax
        jae     1f
        movl    %eax,%edx