Messages in this thread | | | Date | Mon, 3 Jun 2013 11:28:10 +0300 | From | Gleb Natapov <> | Subject | Re: [PATCH] KVM: fix sil/dil/bpl/spl in the mod/rm fields |
| |
On Thu, May 30, 2013 at 04:35:55PM +0200, Paolo Bonzini wrote: > The x86-64 extended low-byte registers were fetched correctly from reg, > but not from mod/rm. > > This fixes another bug in the boot of RHEL5.9 64-bit, but it is still > not enough. > > Cc: gnatapov@redhat.com > Cc: kvm@vger.kernel.org > Cc: <stable@vger.kernel.org> # 3.9 > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Applied to master, thanks.
> --- > arch/x86/kvm/emulate.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c > index aa68106..028b34f 100644 > --- a/arch/x86/kvm/emulate.c > +++ b/arch/x86/kvm/emulate.c > @@ -1239,9 +1239,12 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt, > ctxt->modrm_seg = VCPU_SREG_DS; > > if (ctxt->modrm_mod == 3) { > + int highbyte_regs = ctxt->rex_prefix == 0; > + > op->type = OP_REG; > op->bytes = (ctxt->d & ByteOp) ? 1 : ctxt->op_bytes; > - op->addr.reg = decode_register(ctxt, ctxt->modrm_rm, ctxt->d & ByteOp); > + op->addr.reg = decode_register(ctxt, ctxt->modrm_rm, > + highbyte_regs && (ctxt->d & ByteOp)); > if (ctxt->d & Sse) { > op->type = OP_XMM; > op->bytes = 16; > -- > 1.8.1.4
-- Gleb.
| |