qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH] exec: fix madvise of NULL pointer


From: Paolo Bonzini
Subject: [Qemu-devel] [PATCH] exec: fix madvise of NULL pointer
Date: Wed, 21 Jan 2015 16:18:52 +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 081818e..bfbfd23 100644
--- a/exec.c
+++ b/exec.c
@@ -1402,12 +1402,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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]