dcavalca / rpms / qemu

Forked from rpms/qemu 11 months ago
Clone

Blame 0004-i386-avoid-null-pointer-dereference.patch

b24b7f
From: P J P <ppandit@redhat.com>
b24b7f
Date: Fri, 18 Dec 2015 11:35:07 +0530
b24b7f
Subject: [PATCH] i386: avoid null pointer dereference
b24b7f
b24b7f
    Hello,
b24b7f
b24b7f
A null pointer dereference issue was reported by Mr Ling Liu, CC'd here. It
b24b7f
occurs while doing I/O port write operations via hmp interface. In that,
b24b7f
'current_cpu' remains null as it is not called from cpu_exec loop, which
b24b7f
results in the said issue.
b24b7f
b24b7f
Below is a proposed (tested)patch to fix this issue; Does it look okay?
b24b7f
b24b7f
===
b24b7f
From ae88a4947fab9a148cd794f8ad2d812e7f5a1d0f Mon Sep 17 00:00:00 2001
b24b7f
From: Prasad J Pandit <pjp@fedoraproject.org>
b24b7f
Date: Fri, 18 Dec 2015 11:16:07 +0530
b24b7f
Subject: [PATCH] i386: avoid null pointer dereference
b24b7f
b24b7f
When I/O port write operation is called from hmp interface,
b24b7f
'current_cpu' remains null, as it is not called from cpu_exec()
b24b7f
loop. This leads to a null pointer dereference in vapic_write
b24b7f
routine. Add check to avoid it.
b24b7f
b24b7f
Reported-by: Ling Liu <liuling-it@360.cn>
b24b7f
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
b24b7f
Message-Id: <alpine.LFD.2.20.1512181129320.9805@wniryva>
b24b7f
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
b24b7f
Signed-off-by: P J P <ppandit@redhat.com>
b24b7f
(cherry picked from commit 4c1396cb576c9b14425558b73de1584c7a9735d7)
b24b7f
---
b24b7f
 hw/i386/kvmvapic.c | 15 ++++++++++-----
b24b7f
 1 file changed, 10 insertions(+), 5 deletions(-)
b24b7f
b24b7f
diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c
b24b7f
index c6d34b2..f0922da 100644
b24b7f
--- a/hw/i386/kvmvapic.c
b24b7f
+++ b/hw/i386/kvmvapic.c
b24b7f
@@ -634,13 +634,18 @@ static int vapic_prepare(VAPICROMState *s)
b24b7f
 static void vapic_write(void *opaque, hwaddr addr, uint64_t data,
b24b7f
                         unsigned int size)
b24b7f
 {
b24b7f
-    CPUState *cs = current_cpu;
b24b7f
-    X86CPU *cpu = X86_CPU(cs);
b24b7f
-    CPUX86State *env = &cpu->env;
b24b7f
-    hwaddr rom_paddr;
b24b7f
     VAPICROMState *s = opaque;
b24b7f
+    X86CPU *cpu;
b24b7f
+    CPUX86State *env;
b24b7f
+    hwaddr rom_paddr;
b24b7f
 
b24b7f
-    cpu_synchronize_state(cs);
b24b7f
+    if (!current_cpu) {
b24b7f
+        return;
b24b7f
+    }
b24b7f
+
b24b7f
+    cpu_synchronize_state(current_cpu);
b24b7f
+    cpu = X86_CPU(current_cpu);
b24b7f
+    env = &cpu->env;
b24b7f
 
b24b7f
     /*
b24b7f
      * The VAPIC supports two PIO-based hypercalls, both via port 0x7E.