Re: [PATCH] kvm: x86: Use X86_CR4_PAE instead of X86_CR4_PAE_BIT while validating sregs

[KarimAllah Ahmed]

Please ignore. I just noticed that a similar patch is already in Radim's 
tree and queued for linus.


On 01/20/2018 07:08 PM, KarimAllah Ahmed wrote:
> Use the mask (X86_CR4_PAE) instead of the bit itself (X86_CR4_PAE_BIT) while
> validating sregs.
>
> Cc: Paolo Bonzini <pbonzini@xxxxxxxxxx>
> Cc: Radim KrÄmÃÅ <rkrcmar@xxxxxxxxxx>
> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> Cc: Ingo Molnar <mingo@xxxxxxxxxx>
> Cc: H. Peter Anvin <hpa@xxxxxxxxx>
> Cc: x86@xxxxxxxxxx
> Cc: kvm@xxxxxxxxxxxxxxx
> Cc: linux-kernel@xxxxxxxxxxxxxxx
> Signed-off-by: KarimAllah Ahmed <karahmed@xxxxxxxxx>
> ---
>   arch/x86/kvm/x86.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index abd1723..6f452bc 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -7664,7 +7664,7 @@ int kvm_valid_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)
>   		 * 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 {

Amazon Development Center Germany GmbH
Berlin - Dresden - Aachen
main office: Krausenstr. 38, 10117 Berlin
Geschaeftsfuehrer: Dr. Ralf Herbrich, Christian Schlaeger
Ust-ID: DE289237879
Eingetragen am Amtsgericht Charlottenburg HRB 149173 B