From: Greg Kroah-Hartman Date: Mon, 16 Oct 2017 16:07:09 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v3.18.76~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ef8d1ae986738e3b15c79e2d2f72a7afd112479;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: kvm-nvmx-update-last_nonleaf_level-when-initializing-nested-ept.patch --- diff --git a/queue-4.9/kvm-nvmx-update-last_nonleaf_level-when-initializing-nested-ept.patch b/queue-4.9/kvm-nvmx-update-last_nonleaf_level-when-initializing-nested-ept.patch new file mode 100644 index 00000000000..a76efa30682 --- /dev/null +++ b/queue-4.9/kvm-nvmx-update-last_nonleaf_level-when-initializing-nested-ept.patch @@ -0,0 +1,34 @@ +From fd19d3b45164466a4adce7cbff448ba9189e1427 Mon Sep 17 00:00:00 2001 +From: Ladi Prosek +Date: Thu, 5 Oct 2017 11:10:22 +0200 +Subject: KVM: nVMX: update last_nonleaf_level when initializing nested EPT + +From: Ladi Prosek + +commit fd19d3b45164466a4adce7cbff448ba9189e1427 upstream. + +The function updates context->root_level but didn't call +update_last_nonleaf_level so the previous and potentially wrong value +was used for page walks. For example, a zero value of last_nonleaf_level +would allow a potential out-of-bounds access in arch/x86/mmu/paging_tmpl.h's +walk_addr_generic function (CVE-2017-12188). + +Fixes: 155a97a3d7c78b46cef6f1a973c831bc5a4f82bb +Signed-off-by: Ladi Prosek +Signed-off-by: Paolo Bonzini +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/kvm/mmu.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/x86/kvm/mmu.c ++++ b/arch/x86/kvm/mmu.c +@@ -4169,6 +4169,7 @@ void kvm_init_shadow_ept_mmu(struct kvm_ + + update_permission_bitmask(vcpu, context, true); + update_pkru_bitmask(vcpu, context, true); ++ update_last_nonleaf_level(vcpu, context); + reset_rsvds_bits_mask_ept(vcpu, context, execonly); + reset_ept_shadow_zero_bits_mask(vcpu, context, execonly); + } diff --git a/queue-4.9/series b/queue-4.9/series index 5ef512ed822..9d9046ba767 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -36,3 +36,4 @@ usb-serial-option-add-support-for-tp-link-lte-module.patch usb-serial-qcserial-add-dell-dw5818-dw5819.patch usb-serial-console-fix-use-after-free-after-failed-setup.patch x86-alternatives-fix-alt_max_short-macro-to-really-be-a-max.patch +kvm-nvmx-update-last_nonleaf_level-when-initializing-nested-ept.patch