summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2005-03-16 07:08:39 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2005-03-16 07:08:39 +0000
commitdef4061f3e12c72aacf143145358c5a59bd68e40 (patch)
tree5c5b0f2394d42e25937fbe6ffc39c0f0413bbac4 /sys/arch
parentffd98f04e5d03561352c1b507b5a2c19b117210a (diff)
amd64 also fails copyoutstr regress, missed in the first round.
need to checker the to address. patch from netbsd. ok deraadt mickey
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/amd64/amd64/copy.S4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/arch/amd64/amd64/copy.S b/sys/arch/amd64/amd64/copy.S
index 6a8a1b3d2cd..baf97d74fd1 100644
--- a/sys/arch/amd64/amd64/copy.S
+++ b/sys/arch/amd64/amd64/copy.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: copy.S,v 1.1 2004/01/28 01:39:38 mickey Exp $ */
+/* $OpenBSD: copy.S,v 1.2 2005/03/16 07:08:38 tedu Exp $ */
/* $NetBSD: copy.S,v 1.1 2003/04/26 18:39:26 fvdl Exp $ */
/*
@@ -207,6 +207,7 @@ ENTRY(copyoutstr)
*/
movq $VM_MAXUSER_ADDRESS,%rax
subq %rdi,%rax
+ jc _C_LABEL(copystr_efault)
cmpq %rdx,%rax
jae 1f
movq %rax,%rdx
@@ -248,6 +249,7 @@ ENTRY(copyinstr)
*/
movq $VM_MAXUSER_ADDRESS,%rax
subq %rsi,%rax
+ jc _C_LABEL(copystr_efault)
cmpq %rdx,%rax
jae 1f
movq %rax,%rdx