Prev: [192/200] KVM: VMX: enable VMXON check with SMX enabled (Intel TXT)
Next: [193/200] KVM: MMU: Dont read pdptrs with mmu spinlock held in mmu_alloc_roots
From: Greg KH on 1 Jul 2010 17:30 2.6.34-stable review patch. If anyone has any objections, please let me know. ------------------ From: Joerg Roedel <joerg.roedel(a)amd.com> This patch disables the possibility for a l2-guest to do a VMMCALL directly into the host. This would happen if the l1-hypervisor doesn't intercept VMMCALL and the l2-guest executes this instruction. Signed-off-by: Joerg Roedel <joerg.roedel(a)amd.com> Signed-off-by: Avi Kivity <avi(a)redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> (Cherry-picked from commit 0d945bd9351199744c1e89d57a70615b6ee9f394) --- arch/x86/kvm/svm.c | 3 +++ 1 file changed, 3 insertions(+) --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -1854,6 +1854,9 @@ static bool nested_svm_vmrun(struct vcpu svm->vmcb->control.intercept_cr_write &= ~INTERCEPT_CR8_MASK; } + /* We don't want to see VMMCALLs from a nested guest */ + svm->vmcb->control.intercept &= ~(1ULL << INTERCEPT_VMMCALL); + /* We don't want a nested guest to be more powerful than the guest, so all intercepts are ORed */ svm->vmcb->control.intercept_cr_read |= -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |