lkml.org 
[lkml]   [2009]   [Aug]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/47] KVM: x86: Disallow hypercalls for guest callers in rings > 0
    Date
    From: Jan Kiszka <jan.kiszka@siemens.com>

    So far unprivileged guest callers running in ring 3 can issue, e.g., MMU
    hypercalls. Normally, such callers cannot provide any hand-crafted MMU
    command structure as it has to be passed by its physical address, but
    they can still crash the guest kernel by passing random addresses.

    To close the hole, this patch considers hypercalls valid only if issued
    from guest ring 0. This may still be relaxed on a per-hypercall base in
    the future once required.

    Cc: stable@kernel.org
    Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
    Signed-off-by: Avi Kivity <avi@redhat.com>
    ---
    arch/x86/kvm/x86.c | 6 ++++++
    include/linux/kvm_para.h | 1 +
    2 files changed, 7 insertions(+), 0 deletions(-)

    diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
    index fa525d5..92b5edd 100644
    --- a/arch/x86/kvm/x86.c
    +++ b/arch/x86/kvm/x86.c
    @@ -3213,6 +3213,11 @@ int kvm_emulate_hypercall(struct kvm_vcpu *vcpu)
    a3 &= 0xFFFFFFFF;
    }

    + if (kvm_x86_ops->get_cpl(vcpu) != 0) {
    + ret = -KVM_EPERM;
    + goto out;
    + }
    +
    switch (nr) {
    case KVM_HC_VAPIC_POLL_IRQ:
    ret = 0;
    @@ -3224,6 +3229,7 @@ int kvm_emulate_hypercall(struct kvm_vcpu *vcpu)
    ret = -KVM_ENOSYS;
    break;
    }
    +out:
    kvm_register_write(vcpu, VCPU_REGS_RAX, ret);
    ++vcpu->stat.hypercalls;
    return r;
    diff --git a/include/linux/kvm_para.h b/include/linux/kvm_para.h
    index 3ddce03..d731092 100644
    --- a/include/linux/kvm_para.h
    +++ b/include/linux/kvm_para.h
    @@ -13,6 +13,7 @@
    #define KVM_ENOSYS 1000
    #define KVM_EFAULT EFAULT
    #define KVM_E2BIG E2BIG
    +#define KVM_EPERM EPERM

    #define KVM_HC_VAPIC_POLL_IRQ 1
    #define KVM_HC_MMU_OP 2
    --
    1.6.4.1


    \
     
     \ /
      Last update: 2009-08-26 12:37    [W:0.021 / U:91.680 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site