diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.9.21/0014-KVM-nVMX-kmap-can-t-fail.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.9.21/0014-KVM-nVMX-kmap-can-t-fail.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.9.21/0014-KVM-nVMX-kmap-can-t-fail.patch b/common/recipes-kernel/linux/linux-yocto-4.9.21/0014-KVM-nVMX-kmap-can-t-fail.patch new file mode 100644 index 00000000..38a23282 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.9.21/0014-KVM-nVMX-kmap-can-t-fail.patch @@ -0,0 +1,47 @@ +From 6b359ffcb519698f93eadc2706d06805ce933086 Mon Sep 17 00:00:00 2001 +From: David Hildenbrand <david@redhat.com> +Date: Wed, 25 Jan 2017 11:58:57 +0100 +Subject: [PATCH 14/33] KVM: nVMX: kmap() can't fail + +commit 42cf014d38d8822cce63703a467e00f65d000952 upstream. + +kmap() can't fail, therefore it will always return a valid pointer. Let's +just get rid of the unnecessary checks. + +Signed-off-by: David Hildenbrand <david@redhat.com> +Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + arch/x86/kvm/vmx.c | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c +index af90bc4..17fcbaf 100644 +--- a/arch/x86/kvm/vmx.c ++++ b/arch/x86/kvm/vmx.c +@@ -4742,10 +4742,6 @@ static int vmx_complete_nested_posted_interrupt(struct kvm_vcpu *vcpu) + return 0; + + vapic_page = kmap(vmx->nested.virtual_apic_page); +- if (!vapic_page) { +- WARN_ON(1); +- return -ENOMEM; +- } + __kvm_apic_update_irr(vmx->nested.pi_desc->pir, vapic_page); + kunmap(vmx->nested.virtual_apic_page); + +@@ -9562,11 +9558,6 @@ static inline bool nested_vmx_merge_msr_bitmap(struct kvm_vcpu *vcpu, + return false; + } + msr_bitmap_l1 = (unsigned long *)kmap(page); +- if (!msr_bitmap_l1) { +- nested_release_page_clean(page); +- WARN_ON(1); +- return false; +- } + + memset(msr_bitmap_l0, 0xff, PAGE_SIZE); + +-- +2.7.4 + |