[pve-devel] [PATCH kernel stable-4 2/3] drop patches applied upstream

[Fabian Grünbichler]

Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
 Makefile                                           |  1 -
 ...kvm-page-reference-leakage-in-handle_vmon.patch | 46 ----------------------
 2 files changed, 47 deletions(-)
 delete mode 100644 CVE-2017-2596-kvm-page-reference-leakage-in-handle_vmon.patch

diff --git a/Makefile b/Makefile
index ff259fe..9fa7cff 100644
--- a/Makefile
+++ b/Makefile
@@ -263,7 +263,6 @@ ${KERNEL_SRC}/README ${KERNEL_CFG_ORG}: ${KERNELSRCTAR}
 	cd ${KERNEL_SRC}; patch -p1 < ../mei_drop-watchdog-code.patch
 	cd ${KERNEL_SRC}; patch -p1 < ../mei_bus-whitelist-watchdog-client.patch
 	cd ${KERNEL_SRC}; patch -p1 < ../cgroup-cpuset-add-cpuset.remap_cpus.patch
-	cd ${KERNEL_SRC}; patch -p1 < ../CVE-2017-2596-kvm-page-reference-leakage-in-handle_vmon.patch
 	cd ${KERNEL_SRC}; patch -p1 < ../Revert-intel_idle-Add-CPU-model-54-Atom-N2000-series.patch
 	sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
 	touch $@
diff --git a/CVE-2017-2596-kvm-page-reference-leakage-in-handle_vmon.patch b/CVE-2017-2596-kvm-page-reference-leakage-in-handle_vmon.patch
deleted file mode 100644
index 27ba688..0000000
--- a/CVE-2017-2596-kvm-page-reference-leakage-in-handle_vmon.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Subject:    [PATCH] kvm: fix page struct leak in handle_vmon
-From:       Paolo Bonzini <pbonzini () redhat ! com>
-Date:       2017-01-24 10:56:21
-
-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 at google.com>
-Signed-off-by: Paolo Bonzini <pbonzini at redhat.com>
-Reviewed-by: David Hildenbrand <david at redhat.com>
-Backported-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
----
- arch/x86/kvm/vmx.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
-index 42cc3d6f4d20..0f7345035210 100644
---- a/arch/x86/kvm/vmx.c
-+++ b/arch/x86/kvm/vmx.c
-@@ -6676,14 +6676,20 @@ 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);
-+			skip_emulated_instruction(vcpu);
-+			return 1;
-+		}
-+		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:
--- 
-1.8.3.1
-- 
2.11.0