[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/19] exec: fix madvise of NULL pointer
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 16/19] exec: fix madvise of NULL pointer |
Date: |
Mon, 26 Jan 2015 10:24:27 +0100 |
Coverity flags this as "dereference after null check". Not quite a
dereference, since it will just EFAULT, but still nice to fix.
Signed-off-by: Paolo Bonzini <address@hidden>
---
exec.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/exec.c b/exec.c
index 410371d..6b79ad1 100644
--- a/exec.c
+++ b/exec.c
@@ -1386,12 +1386,13 @@ static ram_addr_t ram_block_add(RAMBlock *new_block,
Error **errp)
cpu_physical_memory_set_dirty_range(new_block->offset,
new_block->used_length);
- 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 (kvm_enabled()) {
- kvm_setup_guest_memory(new_block->host, new_block->max_length);
+ if (new_block->host) {
+ 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 (kvm_enabled()) {
+ kvm_setup_guest_memory(new_block->host, new_block->max_length);
+ }
}
return new_block->offset;
--
1.8.3.1
- [Qemu-devel] [PULL 09/19] vmstate: accept QEMUTimer in VMSTATE_TIMER*, add VMSTATE_TIMER_PTR*, (continued)
- [Qemu-devel] [PULL 09/19] vmstate: accept QEMUTimer in VMSTATE_TIMER*, add VMSTATE_TIMER_PTR*, Paolo Bonzini, 2015/01/26
- [Qemu-devel] [PULL 02/19] tests/multiboot: Update reference output, Paolo Bonzini, 2015/01/26
- [Qemu-devel] [PULL 11/19] kvm_stat: Add aarch64 support, Paolo Bonzini, 2015/01/26
- [Qemu-devel] [PULL 14/19] apic: do not dereference pointer before it is checked for NULL, Paolo Bonzini, 2015/01/26
- [Qemu-devel] [PULL 10/19] hw: misc, add educational driver, Paolo Bonzini, 2015/01/26
- [Qemu-devel] [PULL 15/19] .travis.yml: Add "--enable-modules", Paolo Bonzini, 2015/01/26
- [Qemu-devel] [PULL 08/19] qemu-timer: introduce timer_deinit, Paolo Bonzini, 2015/01/26
- [Qemu-devel] [PULL 17/19] sparse: Fix build with sparse on .S files, Paolo Bonzini, 2015/01/26
- [Qemu-devel] [PULL 19/19] kvm_stat: Add RESET support for perf event ioctl, Paolo Bonzini, 2015/01/26
- [Qemu-devel] [PULL 12/19] kvm_stat: Update exit reasons to the latest defintion, Paolo Bonzini, 2015/01/26
- [Qemu-devel] [PULL 16/19] exec: fix madvise of NULL pointer,
Paolo Bonzini <=
- [Qemu-devel] [PULL 13/19] kvm_stat: Print errno when syscall to perf_event_open() fails, Paolo Bonzini, 2015/01/26
- [Qemu-devel] [PULL 18/19] target-i386: Disable HLE and RTM on Haswell & Broadwell, Paolo Bonzini, 2015/01/26
- Re: [Qemu-devel] [PULL 00/19] i386, KVM, misc changes for 2015-01-26, Peter Maydell, 2015/01/26