[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 5/6] kvm: Fix crash due to access uninitialized kvm_state
From: |
Peter Maydell |
Subject: |
[PULL 5/6] kvm: Fix crash due to access uninitialized kvm_state |
Date: |
Mon, 31 Jul 2023 15:15:32 +0100 |
From: Gavin Shan <gshan@redhat.com>
Runs into core dump on arm64 and the backtrace extracted from the
core dump is shown as below. It's caused by accessing uninitialized
@kvm_state in kvm_flush_coalesced_mmio_buffer() due to commit 176d073029
("hw/arm/virt: Use machine_memory_devices_init()"), where the machine's
memory region is added earlier than before.
main
qemu_init
configure_accelerators
qemu_opts_foreach
do_configure_accelerator
accel_init_machine
kvm_init
virt_kvm_type
virt_set_memmap
machine_memory_devices_init
memory_region_add_subregion
memory_region_add_subregion_common
memory_region_update_container_subregions
memory_region_transaction_begin
qemu_flush_coalesced_mmio_buffer
kvm_flush_coalesced_mmio_buffer
Fix it by bailing early in kvm_flush_coalesced_mmio_buffer() on the
uninitialized @kvm_state. With this applied, no crash is observed on
arm64.
Fixes: 176d073029 ("hw/arm/virt: Use machine_memory_devices_init()")
Signed-off-by: Gavin Shan <gshan@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-id: 20230731125946.2038742-1-gshan@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
accel/kvm/kvm-all.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 373d876c058..7b3da8dc3ab 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -2812,7 +2812,7 @@ void kvm_flush_coalesced_mmio_buffer(void)
{
KVMState *s = kvm_state;
- if (s->coalesced_flush_in_progress) {
+ if (!s || s->coalesced_flush_in_progress) {
return;
}
--
2.34.1
- [PULL 0/6] target-arm queue, Peter Maydell, 2023/07/31
- [PULL 1/6] target/arm: Fix MemOp for STGP, Peter Maydell, 2023/07/31
- [PULL 5/6] kvm: Fix crash due to access uninitialized kvm_state,
Peter Maydell <=
- [PULL 4/6] target/arm/tcg: Don't build AArch64 decodetree files for qemu-system-arm, Peter Maydell, 2023/07/31
- [PULL 3/6] target/arm: Avoid writing to constant TCGv in trans_CSEL(), Peter Maydell, 2023/07/31
- [PULL 6/6] gdbstub: Fix client Ctrl-C handling, Peter Maydell, 2023/07/31
- [PULL 2/6] elf2dmp: Don't abandon when Prcb is set to 0, Peter Maydell, 2023/07/31
- Re: [PULL 0/6] target-arm queue, Richard Henderson, 2023/07/31