spapr: fix memory leak in spapr_core_pre_plug()

[Qemu-devel] [PATCH] spapr: fix memory leak in spapr_core_pre_plug()

Greg Kurz posted 1 patch 6 years, 9 months ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/150001864048.7077.16008343547703241545.stgit@bahia.lan

Test FreeBSD passed

Test checkpatch passed

Test docker passed

Test s390x passed

hw/ppc/spapr.c |    4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Expand all Fold all

[Qemu-devel] [PATCH] spapr: fix memory leak in spapr_core_pre_plug()

Posted by Greg Kurz 6 years, 9 months ago

In case of error, we must ensure the dynamically allocated base_core_type
is freed, like it is done everywhere else in this function.

This is a regression introduced in QEMU 2.9 by commit 8149e2992f78.

Signed-off-by: Greg Kurz <groug@kaod.org>
---
 hw/ppc/spapr.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 638b8243de04..ed9b57d1fc2a 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -3150,9 +3150,9 @@ static void spapr_core_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
      * total vcpus not a multiple of threads-per-core.
      */
     if (mc->has_hotpluggable_cpus && (cc->nr_threads != smp_threads)) {
-        error_setg(errp, "invalid nr-threads %d, must be %d",
+        error_setg(&local_err, "invalid nr-threads %d, must be %d",
                    cc->nr_threads, smp_threads);
-        return;
+        goto out;
     }
 
     core_slot = spapr_find_cpu_slot(MACHINE(hotplug_dev), cc->core_id, &index);

Re: [Qemu-devel] [PATCH] spapr: fix memory leak in spapr_core_pre_plug()

Posted by David Gibson 6 years, 9 months ago

On Fri, Jul 14, 2017 at 09:50:40AM +0200, Greg Kurz wrote:
> In case of error, we must ensure the dynamically allocated base_core_type
> is freed, like it is done everywhere else in this function.
> 
> This is a regression introduced in QEMU 2.9 by commit 8149e2992f78.
> 
> Signed-off-by: Greg Kurz <groug@kaod.org>

Applied to ppc-for-2.10.

> ---
>  hw/ppc/spapr.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 638b8243de04..ed9b57d1fc2a 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -3150,9 +3150,9 @@ static void spapr_core_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
>       * total vcpus not a multiple of threads-per-core.
>       */
>      if (mc->has_hotpluggable_cpus && (cc->nr_threads != smp_threads)) {
> -        error_setg(errp, "invalid nr-threads %d, must be %d",
> +        error_setg(&local_err, "invalid nr-threads %d, must be %d",
>                     cc->nr_threads, smp_threads);
> -        return;
> +        goto out;
>      }
>  
>      core_slot = spapr_find_cpu_slot(MACHINE(hotplug_dev), cc->core_id, &index);
> 

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson