lkml.org 
[lkml]   [2018]   [Feb]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 213/254] KVM/x86: Fix wrong macro references of X86_CR0_PG_BIT and X86_CR4_PAE_BIT in kvm_valid_sregs()
    3.16.55-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Tianyu Lan <lantianyu1986@gmail.com>

    commit 37b95951c58fdf08dc10afa9d02066ed9f176fb5 upstream.

    kvm_valid_sregs() should use X86_CR0_PG and X86_CR4_PAE to check bit
    status rather than X86_CR0_PG_BIT and X86_CR4_PAE_BIT. This patch is
    to fix it.

    Fixes: f29810335965a(KVM/x86: Check input paging mode when cs.l is set)
    Reported-by: Jeremi Piotrowski <jeremi.piotrowski@gmail.com>
    Cc: Paolo Bonzini <pbonzini@redhat.com>
    Cc: Radim Krčmář <rkrcmar@redhat.com>
    Signed-off-by: Tianyu Lan <Tianyu.Lan@microsoft.com>
    Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    arch/x86/kvm/x86.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/arch/x86/kvm/x86.c
    +++ b/arch/x86/kvm/x86.c
    @@ -6581,13 +6581,13 @@ EXPORT_SYMBOL_GPL(kvm_task_switch);

    int kvm_valid_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)
    {
    - if ((sregs->efer & EFER_LME) && (sregs->cr0 & X86_CR0_PG_BIT)) {
    + if ((sregs->efer & EFER_LME) && (sregs->cr0 & X86_CR0_PG)) {
    /*
    * When EFER.LME and CR0.PG are set, the processor is in
    * 64-bit mode (though maybe in a 32-bit code segment).
    * CR4.PAE and EFER.LMA must be set.
    */
    - if (!(sregs->cr4 & X86_CR4_PAE_BIT)
    + if (!(sregs->cr4 & X86_CR4_PAE)
    || !(sregs->efer & EFER_LMA))
    return -EINVAL;
    } else {
    \
     
     \ /
      Last update: 2018-02-28 18:00    [W:4.487 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site