commit 579a97f7ff4c0f958a5d8adcba717a205bb58567
author bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> Sun Nov 11 14:26:47 2007 +0000
committer bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> Sun Nov 11 14:26:47 2007 +0000
tree 845f187afdd4a15f4625d2156f0fd967beb50c5d
parent 44f8625d23f9807c0853556ffe1c44540bd453f9

Linux user memory access API change (initial patch by Thayne Harbaugh)


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3583 c046a42c-6fe2-441c-8c8c-71466251a162

linux-user/vm86.c

diff --git a/linux-user/vm86.c b/linux-user/vm86.c
index a3c92e1..cb5ff9d 100644
--- a/linux-user/vm86.c
+++ b/linux-user/vm86.c
@@ -64,7 +64,9 @@
     TaskState *ts = env->opaque;
     struct target_vm86plus_struct * target_v86;
 
-    lock_user_struct(target_v86, ts->target_v86, 0);
+    if (!lock_user_struct(VERIFY_WRITE, target_v86, ts->target_v86, 0))
+        /* FIXME - should return an error */
+        return;
     /* put the VM86 registers in the userspace register structure */
     target_v86->regs.eax = tswap32(env->regs[R_EAX]);
     target_v86->regs.ebx = tswap32(env->regs[R_EBX]);
@@ -424,7 +426,8 @@
     ts->vm86_saved_regs.gs = env->segs[R_GS].selector;
 
     ts->target_v86 = vm86_addr;
-    lock_user_struct(target_v86, vm86_addr, 1);
+    if (!lock_user_struct(VERIFY_READ, target_v86, vm86_addr, 1))
+        return -EFAULT;
     /* build vm86 CPU state */
     ts->v86flags = tswap32(target_v86->regs.eflags);
     env->eflags = (env->eflags & ~SAFE_MASK) |