Commit ba7f1c93 authored Sep 12, 2019 by Fuqian Huang Committed by Greg Kroah-Hartman Sep 21, 2019

KVM: x86: work around leak of uninitialized stack contents



commit 541ab2aeb28251bf7135c7961f3a6080eebcc705 upstream.

Emulation of VMPTRST can incorrectly inject a page fault
when passed an operand that points to an MMIO address.
The page fault will use uninitialized kernel stack memory
as the CR2 and error code.

The right behavior would be to abort the VM with a KVM_EXIT_INTERNAL_ERROR
exit to userspace; however, it is not an easy fix, so for now just ensure
that the error code and CR2 are zero.

Signed-off-by: Fuqian Huang <huangfq.daxian@gmail.com>
Cc: stable@vger.kernel.org
[add comment]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent cb3f9ff6

arch/x86/kvm/x86.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -4337,6 +4337,13 @@ static int emulator_write_std(struct x86_emulate_ctxt ctxt, gva_t addr, void v
		if (!system && kvm_x86_ops->get_cpl(vcpu) == 3)
		access \|= PFERR_USER_MASK;

		/*
		* FIXME: this should call handle_emulation_failure if X86EMUL_IO_NEEDED
		* is returned, but our callers are not ready for that and they blindly
		* call kvm_inject_page_fault. Ensure that they at least do not leak
		* uninitialized kernel stack memory into cr2 and error code.
		*/
		memset(exception, 0, sizeof(*exception));
		return kvm_write_guest_virt_helper(addr, val, bytes, vcpu,
		access, exception);
		}