[1/2] KVM: nVMX: update last_nonleaf_level when initializing nested EPT

Submitted by Denis Plotnikov on Oct. 13, 2017, 4:10 p.m.


Message ID 1507911001-12510-2-git-send-email-dplotnikov@virtuozzo.com
State New
Series "fix CVE-2017-12188 KVM: MMU potential stack buffer overrun during page walks"
Headers show

Commit Message

Denis Plotnikov Oct. 13, 2017, 4:10 p.m.
From: Ladi Prosek <lprosek@redhat.com>

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 <lprosek@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

(cherry picked from commit fd19d3b45164466a4adce7cbff448ba9189e1427)
fix #PSBM-74910
Signed-off-by: Denis Plotnikov <dplotnikov@virtuozzo.com>
 arch/x86/kvm/mmu.c | 1 +
 1 file changed, 1 insertion(+)

Patch hide | download patch | download mbox

diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index bb15151..5b64390 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -4118,6 +4118,7 @@  void kvm_init_shadow_ept_mmu(struct kvm_vcpu *vcpu, bool execonly)
 	context->direct_map = false;
 	update_permission_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);