Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1734042

[PATCH] KVM: x86: Fix the NULL pointer parameter in check_cr_write()

Show all headers | View raw

Routine check_cr_write() will trigger emulator_get_cpuid()->
kvm_cpuid() to get maxphyaddr, and NULL is passed as values
for ebx/ecx/edx. This is problematic because kvm_cpuid() will
dereference these pointers.

Fixes: d1cd3ce90044 ("KVM: MMU: check guest CR3 reserved bits based on its physical address width.")
Reported-by: Jim Mattson <jmattson@google.com>
Signed-off-by: Yu Zhang <yu.c.zhang@linux.intel.com>
---
 arch/x86/kvm/emulate.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 16bf665..15f527b 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -4102,10 +4102,12 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
 		ctxt->ops->get_msr(ctxt, MSR_EFER, &efer);
 		if (efer & EFER_LMA) {
 			u64 maxphyaddr;
-			u32 eax = 0x80000008;
+			u32 eax, ebx, ecx, edx;
 
-			if (ctxt->ops->get_cpuid(ctxt, &eax, NULL, NULL,
-						 NULL, false))
+			eax = 0x80000008;
+			ecx = 0;
+			if (ctxt->ops->get_cpuid(ctxt, &eax, &ebx, &ecx,
+						 &edx, false))
 				maxphyaddr = eax & 0xff;
 			else
 				maxphyaddr = 36;
-- 
2.5.0

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] KVM: x86: Fix the NULL pointer parameter in check_cr_write() Yu Zhang <yu.c.zhang@linux.intel.com> - 2017-09-18 13:10 +0200
  Re: [PATCH] KVM: x86: Fix the NULL pointer parameter in  check_cr_write() David Hildenbrand <david@redhat.com> - 2017-09-18 14:20 +0200
    Re: [PATCH] KVM: x86: Fix the NULL pointer parameter in check_cr_write() Jim Mattson <jmattson@google.com> - 2017-09-18 18:00 +0200
      Re: [PATCH] KVM: x86: Fix the NULL pointer parameter in  check_cr_write() Yu Zhang <yu.c.zhang@linux.intel.com> - 2017-09-20 09:00 +0200
        Re: [PATCH] KVM: x86: Fix the NULL pointer parameter in  check_cr_write() Paolo Bonzini <pbonzini@redhat.com> - 2017-09-20 10:20 +0200
          Re: [PATCH] KVM: x86: Fix the NULL pointer parameter in  check_cr_write() Yu Zhang <yu.c.zhang@linux.intel.com> - 2017-09-20 11:00 +0200

csiph-web