refresh patches for 4.10

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
index 27ba68809b9be2503ab645e48e74a7bb7cdb987c..3d627148c3a782c3b2798b73ac075b8484c45a48 100644 (file)
--- a/CVE-2017-2596-kvm-page-reference-leakage-in-handle_vmon.patch
+++ b/CVE-2017-2596-kvm-page-reference-leakage-in-handle_vmon.patch
@@ -10,7 +10,6 @@ Found by syzkaller; based on a patch by Dmitry.
 Reported-by: Dmitry Vyukov <dvyukov@google.com>
 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Reviewed-by: David Hildenbrand <david@redhat.com>
-Backported-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
  arch/x86/kvm/vmx.c | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
@@ -19,7 +18,7 @@ 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,
+@@ -7085,13 +7085,18 @@ static int nested_vmx_check_vmptr(struct kvm_vcpu *vcpu, int exit_reason,
                }
  
                page = nested_get_page(vcpu, vmptr);
@@ -27,20 +26,16 @@ index 42cc3d6f4d20..0f7345035210 100644
 -                  *(u32 *)kmap(page) != VMCS12_REVISION) {
 +              if (page == NULL) {
                        nested_vmx_failInvalid(vcpu);
-+                      skip_emulated_instruction(vcpu);
-+                      return 1;
++                      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;
+                       return kvm_skip_emulated_instruction(vcpu);
                }
                kunmap(page);
 +              nested_release_page_clean(page);
                vmx->nested.vmxon_ptr = vmptr;
                break;
        case EXIT_REASON_VMCLEAR:
--- 
-1.8.3.1

diff --git a/kvm-dynamic-halt-polling-disable-default.patch b/kvm-dynamic-halt-polling-disable-default.patch
index dcf1deed14eb4b0168a9abc1a8b5b65393d7f306..b6928ee89e3221bf8a23dea0dce55d76ffcf40c0 100644 (file)
--- a/kvm-dynamic-halt-polling-disable-default.patch
+++ b/kvm-dynamic-halt-polling-disable-default.patch
@@ -1,12 +1,12 @@
 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
 --- a/virt/kvm/kvm_main.c 2016-05-12 10:39:37.540387127 +0200
 +++ b/virt/kvm/kvm_main.c 2016-05-04 10:43:38.063996221 +0200
-@@ -71,7 +71,7 @@ static unsigned int halt_poll_ns = KVM_H
- module_param(halt_poll_ns, uint, S_IRUGO | S_IWUSR);
-
+@@ -75,7 +75,7 @@ static unsigned int halt_poll_ns = KVM_H
+ EXPORT_SYMBOL_GPL(halt_poll_ns);
+ 
  /* Default doubles per-vcpu halt_poll_ns. */
--static unsigned int halt_poll_ns_grow = 2;
-+static unsigned int halt_poll_ns_grow = 0;
- module_param(halt_poll_ns_grow, int, S_IRUGO);
-
- /* Default resets per-vcpu halt_poll_ns . */
+-unsigned int halt_poll_ns_grow = 2;
++unsigned int halt_poll_ns_grow = 0;
+ module_param(halt_poll_ns_grow, uint, S_IRUGO | S_IWUSR);
+ EXPORT_SYMBOL_GPL(halt_poll_ns_grow);
+