From: Jim Mattson <jmattson@google.com>
Date: Tue, 12 Sep 2017 20:02:54 +0000 (-0700)
Subject: kvm: nVMX: Don't allow L2 to access the hardware CR8
X-Git-Tag: archive/raspbian/4.9.51-1+rpi1~8^2~35
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=00e9112032ab7650ec98b55ea953c96e8f111078;p=linux-4.9.git

kvm: nVMX: Don't allow L2 to access the hardware CR8

If L1 does not specify the "use TPR shadow" VM-execution control in
vmcs12, then L0 must specify the "CR8-load exiting" and "CR8-store
exiting" VM-execution controls in vmcs02. Failure to do so will give
the L2 VM unrestricted read/write access to the hardware CR8.

This fixes CVE-2017-12154.

Signed-off-by: Jim Mattson <jmattson@google.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Gbp-Pq: Topic bugfix/x86
Gbp-Pq: Name kvm-nvmx-don-t-allow-l2-to-access-the-hardware-cr8.patch
---

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 3dc6d8017ce9..8f5d7902e41b 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -9996,6 +9996,11 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)
 		vmcs_write64(VIRTUAL_APIC_PAGE_ADDR,
 				page_to_phys(vmx->nested.virtual_apic_page));
 		vmcs_write32(TPR_THRESHOLD, vmcs12->tpr_threshold);
+	} else {
+#ifdef CONFIG_X86_64
+		exec_control |= CPU_BASED_CR8_LOAD_EXITING |
+				CPU_BASED_CR8_STORE_EXITING;
+#endif
 	}
 
 	if (cpu_has_vmx_msr_bitmap() &&