[PATCH 13/21] memory-device: Fix latent memory pre-plug error handling bugs

From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: vsementsov@virtuozzo.com, David Hildenbrand <david@redhat.com>
Subject: [PATCH 13/21] memory-device: Fix latent memory pre-plug error handling bugs
Date: Sat, 30 Nov 2019 20:42:32 +0100	[thread overview]
Message-ID: <20191130194240.10517-14-armbru@redhat.com> (raw)
In-Reply-To: <20191130194240.10517-1-armbru@redhat.com>

memory_device_get_free_addr() crashes when
memory_device_check_addable() fails and its @errp argument is null.
Messed up in commit 1b6d6af21b "pc-dimm: factor out capacity and slot
checks into MemoryDevice".

The bug can't bite as no caller actually passes null.  Fix it anyway.

Cc: David Hildenbrand <david@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/mem/memory-device.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c
index aef148c1d7..4bc9cf0917 100644
--- a/hw/mem/memory-device.c
+++ b/hw/mem/memory-device.c
@@ -99,6 +99,7 @@ static uint64_t memory_device_get_free_addr(MachineState *ms,
                                             uint64_t align, uint64_t size,
                                             Error **errp)
 {
+    Error *err = NULL;
     GSList *list = NULL, *item;
     Range as, new = range_empty;
 
@@ -123,8 +124,9 @@ static uint64_t memory_device_get_free_addr(MachineState *ms,
         return 0;
     }
 
-    memory_device_check_addable(ms, size, errp);
-    if (*errp) {
+    memory_device_check_addable(ms, size, &err);
+    if (err) {
+        error_propagate(errp, err);
         return 0;
     }
 
-- 
2.21.0


