---

yaml --- r: 248047 b: refs/heads/master c: 0521e4c h: refs/heads/master i: 248045: 20c6ad3 248043: cbcf509 248039: 6e27a35 248031: 52a5105 v: v3
git-mirror · May 11, 2011 · b729e3a · b729e3a
1 parent 33b6d5e
commit b729e3a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49704f26586ca87fcab4fe9323fff8db41e78910
+refs/heads/master: 0521e4c0bc73aa86152ee4e4bd03724c8a9e1d6b
diff --git a/trunk/arch/x86/kvm/emulate.c b/trunk/arch/x86/kvm/emulate.c
@@ -637,9 +637,12 @@ static int do_fetch_insn_byte(struct x86_emulate_ctxt *ctxt,
 	int size, cur_size;
 
 	if (eip == fc->end) {
+		unsigned long linear = eip + ctxt->cs_base;
+		if (ctxt->mode != X86EMUL_MODE_PROT64)
+			linear &= (u32)-1;
 		cur_size = fc->end - fc->start;
 		size = min(15UL - cur_size, PAGE_SIZE - offset_in_page(eip));
-		rc = ops->fetch(ctxt->cs_base + eip, fc->data + cur_size,
+		rc = ops->fetch(linear, fc->data + cur_size,
 				size, ctxt->vcpu, &ctxt->exception);
 		if (rc != X86EMUL_CONTINUE)
 			return rc;