From 15b3a9358e78b3c8ba8237a8e79bae4a6363f801 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Sun, 18 Feb 2018 18:19:15 -0500 Subject: [PATCH] exec: fix madvise of NULL pointer Coverity flags this as "dereference after null check". Not quite a dereference, since it will just EFAULT, but still nice to fix. Backports commit a904c91196a9c5dbd7b9abcd3d40b0824286fb1c from qemu --- qemu/exec.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/qemu/exec.c b/qemu/exec.c index 038973bc..c7473fab 100644 --- a/qemu/exec.c +++ b/qemu/exec.c @@ -1113,9 +1113,15 @@ static ram_addr_t ram_block_add(struct uc_struct *uc, RAMBlock *new_block, Error new_block->used_length, DIRTY_CLIENTS_ALL); - qemu_ram_setup_dump(new_block->host, new_block->max_length); - //qemu_madvise(new_block->host, new_block->max_length, QEMU_MADV_HUGEPAGE); - //qemu_madvise(new_block->host, new_block->max_length, QEMU_MADV_DONTFORK); + if (new_block->host) { + qemu_ram_setup_dump(new_block->host, new_block->max_length); + // Unicorn: commented out + //qemu_madvise(new_block->host, new_block->max_length, QEMU_MADV_HUGEPAGE); + //qemu_madvise(new_block->host, new_block->max_length, QEMU_MADV_DONTFORK); + //if (kvm_enabled()) { + // kvm_setup_guest_memory(new_block->host, new_block->max_length); + //} + } return new_block->offset; }