From: Greg Kurz <groug@kaod.org>
Date: Tue, 6 Jun 2017 15:22:58 +0000 (+0200)
Subject: spapr: fix memory leak in spapr_memory_pre_plug()
X-Git-Tag: v2.9.1~55
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3b2f3a4691a18b52969e64cafa703e0fff7711c4;p=thirdparty%2Fqemu.git

spapr: fix memory leak in spapr_memory_pre_plug()

The string returned by object_property_get_str() is dynamically allocated.

(Spotted by Coverity, CID 1375942)

Signed-off-by: Greg Kurz <groug@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
(cherry picked from commit 8a9e0e7b890b2598da94646bf6a7272f3d3924de)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 5564f78ff7d..58c15efbabd 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -2547,8 +2547,11 @@ static void spapr_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
     if (mem_dev && !kvmppc_is_mem_backend_page_size_ok(mem_dev)) {
         error_setg(errp, "Memory backend has bad page size. "
                    "Use 'memory-backend-file' with correct mem-path.");
-        return;
+        goto out;
     }
+
+out:
+    g_free(mem_dev);
 }
 
 typedef struct sPAPRDIMMState {