diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-22 09:57:40 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-22 09:57:40 -0400 |
| commit | 0b69b7ab4e444a78c8538a46ed3b7b21853e220b (patch) | |
| tree | 2bc671e98bda633876d792a6cd10d2dc4c3d8c66 | |
| parent | 7368a665fb688b451afb839f708995b9af33efbd (diff) | |
| download | longterm-queue-4.8-0b69b7ab4e444a78c8538a46ed3b7b21853e220b.tar.gz | |
kvm: drop patch with 4.10+ dependencies
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/kvm-fix-page-struct-leak-in-handle_vmon.patch | 45 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 46 deletions
diff --git a/queue/kvm-fix-page-struct-leak-in-handle_vmon.patch b/queue/kvm-fix-page-struct-leak-in-handle_vmon.patch deleted file mode 100644 index 49a7219..0000000 --- a/queue/kvm-fix-page-struct-leak-in-handle_vmon.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 263a374ba609d053610a44f50974aea09d7a2f50 Mon Sep 17 00:00:00 2001 -From: Paolo Bonzini <pbonzini@redhat.com> -Date: Tue, 24 Jan 2017 11:56:21 +0100 -Subject: [PATCH] kvm: fix page struct leak in handle_vmon - -commit 06ce521af9558814b8606c0476c54497cf83a653 upstream. - -handle_vmon gets a reference on VMXON region page, -but does not release it. Release the reference. - -Found by syzkaller; based on a patch by Dmitry. - -Reported-by: Dmitry Vyukov <dvyukov@google.com> -Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> -Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> - -diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c -index fbc958ae7007..6040fe69dabe 100644 ---- a/arch/x86/kvm/vmx.c -+++ b/arch/x86/kvm/vmx.c -@@ -6884,14 +6884,19 @@ static int nested_vmx_check_vmptr(struct kvm_vcpu *vcpu, int exit_reason, - } - - page = nested_get_page(vcpu, vmptr); -- if (page == NULL || -- *(u32 *)kmap(page) != VMCS12_REVISION) { -+ if (page == NULL) { - nested_vmx_failInvalid(vcpu); -+ return kvm_skip_emulated_instruction(vcpu); -+ } -+ if (*(u32 *)kmap(page) != VMCS12_REVISION) { - kunmap(page); -+ nested_release_page_clean(page); -+ nested_vmx_failInvalid(vcpu); - skip_emulated_instruction(vcpu); - return 1; - } - kunmap(page); -+ nested_release_page_clean(page); - vmx->nested.vmxon_ptr = vmptr; - break; - case EXIT_REASON_VMCLEAR: --- -2.12.0 - diff --git a/queue/series b/queue/series index 107926c..3a14f53 100644 --- a/queue/series +++ b/queue/series @@ -174,7 +174,6 @@ pwm-rockchip-State-of-PWM-clock-should-synchronize-w.patch irqchip-irq-imx-gpcv2-Fix-spinlock-initialization.patch ftrace-Fix-removing-of-second-function-probe.patch char-lack-of-bool-string-made-CONFIG_DEVPORT-always-.patch -kvm-fix-page-struct-leak-in-handle_vmon.patch zram-do-not-use-copy_page-with-non-page-aligned-addr.patch ftrace-Fix-function-pid-filter-on-instances.patch crypto-algif_aead-Fix-bogus-request-dereference-in-c.patch |