Skip to content

Commit 541ab2a

Browse files
Yellow-Paybonzini
authored andcommitted
KVM: x86: work around leak of uninitialized stack contents
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 <[email protected]> Cc: [email protected] [add comment] Signed-off-by: Paolo Bonzini <[email protected]>
1 parent f7eea63 commit 541ab2a

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

arch/x86/kvm/x86.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5312,6 +5312,13 @@ int kvm_write_guest_virt_system(struct kvm_vcpu *vcpu, gva_t addr, void *val,
53125312
/* kvm_write_guest_virt_system can pull in tons of pages. */
53135313
vcpu->arch.l1tf_flush_l1d = true;
53145314

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

0 commit comments

Comments
 (0)