From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20130518021654.659755500@goodmis.org> Date: Fri, 17 May 2013 22:17:17 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Gleb Natapov Subject: [ 080/136 ] KVM: X86 emulator: fix source operand decoding for 8bit mov[zs]x instructions References: <20130518021557.139113314@goodmis.org> Content-Disposition: inline; filename=0080-KVM-X86-emulator-fix-source-operand-decoding-for-8bi.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.6.11.4 stable review patch. If anyone has any objections, please let me know. ------------------ From: Gleb Natapov [ Upstream commit 660696d1d16a71e15549ce1bf74953be1592bcd3 ] Source operand for one byte mov[zs]x is decoded incorrectly if it is in high byte register. Fix that. Cc: stable@vger.kernel.org Signed-off-by: Gleb Natapov Signed-off-by: Steven Rostedt --- arch/x86/kvm/emulate.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index a3b57a2..2386209 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -3970,6 +3970,10 @@ static int decode_operand(struct x86_emulate_ctxt *ctxt, struct operand *op, break; case OpMem8: ctxt->memop.bytes = 1; + if (ctxt->memop.type == OP_REG) { + ctxt->memop.addr.reg = decode_register(ctxt, ctxt->modrm_rm, 1); + fetch_register_operand(&ctxt->memop); + } goto mem_common; case OpMem16: ctxt->memop.bytes = 2; -- 1.7.10.4