refresh patches for 4.10

[pve-kernel-jessie.git] / CVE-2017-2596-kvm-page-reference-leakage-in-handle_vmon.patch

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