lkml.org 
[lkml]   [2012]   [May]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 004/117] KVM: nVMX: Fix erroneous exception bitmap check
    3.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Marcelo Tosatti <mtosatti@redhat.com>

    From: Nadav Har'El <nyh@math.technion.ac.il>

    (cherry picked from commit 9587190107d0c0cbaccbf7bf6b0245d29095a9ae)

    The code which checks whether to inject a pagefault to L1 or L2 (in
    nested VMX) was wrong, incorrect in how it checked the PF_VECTOR bit.
    Thanks to Dan Carpenter for spotting this.

    Signed-off-by: Nadav Har'El <nyh@il.ibm.com>
    Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Avi Kivity <avi@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    arch/x86/kvm/vmx.c | 2 +-
    1 files changed, 1 insertions(+), 1 deletions(-)

    diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
    index 4ea7678..7ac5993 100644
    --- a/arch/x86/kvm/vmx.c
    +++ b/arch/x86/kvm/vmx.c
    @@ -1677,7 +1677,7 @@ static int nested_pf_handled(struct kvm_vcpu *vcpu)
    struct vmcs12 *vmcs12 = get_vmcs12(vcpu);

    /* TODO: also check PFEC_MATCH/MASK, not just EB.PF. */
    - if (!(vmcs12->exception_bitmap & PF_VECTOR))
    + if (!(vmcs12->exception_bitmap & (1u << PF_VECTOR)))
    return 0;

    nested_vmx_vmexit(vcpu);



    \
     
     \ /
      Last update: 2012-05-28 08:21    [W:0.023 / U:0.084 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site