evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kvm: vmx: fix oops with explicit flexpriority=0 option

Browse source 
A function pointer was not NULLed, causing kvm_vcpu_reload_apic_access_page to
go down the wrong path and OOPS when doing put_page(NULL).

This did not happen on old processors, only when setting the module option
explicitly.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2015-01-30 16:18:49 +01:00
parent 8a395363e2
commit ad15a29647
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
arch/x86/kvm/vmx.c
View file

@ -5879,16 +5879,16 @@ static __init int hardware_setup(void)
if (!cpu_has_vmx_unrestricted_guest()) if (!cpu_has_vmx_unrestricted_guest())
enable_unrestricted_guest = 0; enable_unrestricted_guest = 0;
if (!cpu_has_vmx_flexpriority()) { if (!cpu_has_vmx_flexpriority())
flexpriority_enabled = 0; flexpriority_enabled = 0;
/* /*
* set_apic_access_page_addr() is used to reload apic access * set_apic_access_page_addr() is used to reload apic access
* page upon invalidation. No need to do anything if the * page upon invalidation. No need to do anything if not
* processor does not have the APIC_ACCESS_ADDR VMCS field. * using the APIC_ACCESS_ADDR VMCS field.
*/ */
if (!flexpriority_enabled)
kvm_x86_ops->set_apic_access_page_addr = NULL; kvm_x86_ops->set_apic_access_page_addr = NULL;
}
if (!cpu_has_vmx_tpr_shadow()) if (!cpu_has_vmx_tpr_shadow())
kvm_x86_ops->update_cr8_intercept = NULL; kvm_x86_ops->update_cr8_intercept = NULL;