lkml.org 
[lkml]   [2009]   [Feb]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 23/40] KVM: Fix vmload and friends misinterpreted as lidt
    Date
    The AMD SVM instruction family all overload the 0f 01 /3 opcode, further
    multiplexing on the three r/m bits. But the code decided that anything that
    isn't a vmmcall must be an lidt (which shares the 0f 01 /3 opcode, for the
    case that mod = 3).

    Fix by aborting emulation if this isn't a vmmcall.

    Signed-off-by: Avi Kivity <avi@redhat.com>
    ---
    arch/x86/kvm/x86_emulate.c | 15 ++++++++++-----
    1 files changed, 10 insertions(+), 5 deletions(-)

    diff --git a/arch/x86/kvm/x86_emulate.c b/arch/x86/kvm/x86_emulate.c
    index d174db7..54fb098 100644
    --- a/arch/x86/kvm/x86_emulate.c
    +++ b/arch/x86/kvm/x86_emulate.c
    @@ -1908,11 +1908,16 @@ twobyte_insn:
    c->dst.type = OP_NONE;
    break;
    case 3: /* lidt/vmmcall */
    - if (c->modrm_mod == 3 && c->modrm_rm == 1) {
    - rc = kvm_fix_hypercall(ctxt->vcpu);
    - if (rc)
    - goto done;
    - kvm_emulate_hypercall(ctxt->vcpu);
    + if (c->modrm_mod == 3) {
    + switch (c->modrm_rm) {
    + case 1:
    + rc = kvm_fix_hypercall(ctxt->vcpu);
    + if (rc)
    + goto done;
    + break;
    + default:
    + goto cannot_emulate;
    + }
    } else {
    rc = read_descriptor(ctxt, ops, c->src.ptr,
    &size, &address,
    --
    1.6.0.6


    \
     
     \ /
      Last update: 2009-02-26 15:25    [W:0.022 / U:1.916 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site