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

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

details:   https://anonhg.NetBSD.org/src/rev/1eb6d6631dbb
branches:  netbsd-2-0
changeset: 564682:1eb6d6631dbb
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Mar 16 11:49:54 2005 +0000

description:
Pull up revision 1.33 (requested by fvdl in ticket #1317):
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/i386/i386/locore.S |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (25 lines):

diff -r 6b0ac991af69 -r 1eb6d6631dbb sys/arch/i386/i386/locore.S
--- a/sys/arch/i386/i386/locore.S       Wed Mar 16 11:49:47 2005 +0000
+++ b/sys/arch/i386/i386/locore.S       Wed Mar 16 11:49:54 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.25.2.2 2004/09/20 05:57:11 tron Exp $     */
+/*     $NetBSD: locore.S,v 1.25.2.3 2005/03/16 11:49:54 tron Exp $     */
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -1180,6 +1180,7 @@
         */
        movl    $VM_MAXUSER_ADDRESS,%eax
        subl    %edi,%eax
+       jc      _C_LABEL(copystr_efault)
        cmpl    %edx,%eax
        jae     1f
        movl    %eax,%edx
@@ -1234,6 +1235,7 @@
         */
        movl    $VM_MAXUSER_ADDRESS,%eax
        subl    %esi,%eax
+       jc      _C_LABEL(copystr_efault)
        cmpl    %edx,%eax
        jae     1f
        movl    %eax,%edx