rebase patches on top of Ubuntu-4.15.0-32.35

[pve-kernel.git] / patches / kernel / 0009-kvm-nVMX-Enforce-cpl-0-for-VMX-instructions.patch

diff --git a/patches/kernel/0009-kvm-nVMX-Enforce-cpl-0-for-VMX-instructions.patch b/patches/kernel/0009-kvm-nVMX-Enforce-cpl-0-for-VMX-instructions.patch
index cc72250f5216929293bc3f2ee6d2a16c090c72c2..eb498346616f1d1cfce52ff4defba2f4f2e3cc60 100644 (file)
--- a/patches/kernel/0009-kvm-nVMX-Enforce-cpl-0-for-VMX-instructions.patch
+++ b/patches/kernel/0009-kvm-nVMX-Enforce-cpl-0-for-VMX-instructions.patch
@@ -17,10 +17,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 13 insertions(+), 2 deletions(-)
 
 diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
-index ddfb9914e105..d81ee9ed4e83 100644
+index 1a5617fc8b6a..5c8bd2d61080 100644
 --- a/arch/x86/kvm/vmx.c
 +++ b/arch/x86/kvm/vmx.c
-@@ -7402,6 +7402,12 @@ static int handle_vmon(struct kvm_vcpu *vcpu)
+@@ -7575,6 +7575,12 @@ static int handle_vmon(struct kvm_vcpu *vcpu)
                return 1;
        }
  
@@ -33,7 +33,7 @@ index ddfb9914e105..d81ee9ed4e83 100644
        if (vmx->nested.vmxon) {
                nested_vmx_failValid(vcpu, VMXERR_VMXON_IN_VMX_ROOT_OPERATION);
                return kvm_skip_emulated_instruction(vcpu);
-@@ -7461,6 +7467,11 @@ static int handle_vmon(struct kvm_vcpu *vcpu)
+@@ -7634,6 +7640,11 @@ static int handle_vmon(struct kvm_vcpu *vcpu)
   */
  static int nested_vmx_check_permission(struct kvm_vcpu *vcpu)
  {
@@ -45,7 +45,7 @@ index ddfb9914e105..d81ee9ed4e83 100644
        if (!to_vmx(vcpu)->nested.vmxon) {
                kvm_queue_exception(vcpu, UD_VECTOR);
                return 0;
-@@ -7794,7 +7805,7 @@ static int handle_vmread(struct kvm_vcpu *vcpu)
+@@ -7967,7 +7978,7 @@ static int handle_vmread(struct kvm_vcpu *vcpu)
                if (get_vmx_mem_address(vcpu, exit_qualification,
                                vmx_instruction_info, true, &gva))
                        return 1;
@@ -54,7 +54,7 @@ index ddfb9914e105..d81ee9ed4e83 100644
                kvm_write_guest_virt_system(&vcpu->arch.emulate_ctxt, gva,
                             &field_value, (is_long_mode(vcpu) ? 8 : 4), NULL);
        }
-@@ -7937,7 +7948,7 @@ static int handle_vmptrst(struct kvm_vcpu *vcpu)
+@@ -8110,7 +8121,7 @@ static int handle_vmptrst(struct kvm_vcpu *vcpu)
        if (get_vmx_mem_address(vcpu, exit_qualification,
                        vmx_instruction_info, true, &vmcs_gva))
                return 1;