From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:43296) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gujzT-0005Qx-40 for qemu-devel@nongnu.org; Fri, 15 Feb 2019 15:21:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gujzS-0007gx-2O for qemu-devel@nongnu.org; Fri, 15 Feb 2019 15:21:43 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:38389) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gujzR-0007VD-RL for qemu-devel@nongnu.org; Fri, 15 Feb 2019 15:21:41 -0500 Received: by mail-wr1-f68.google.com with SMTP id v13so11623402wrw.5 for ; Fri, 15 Feb 2019 12:21:27 -0800 (PST) References: <20190215113707.24553-1-peter.maydell@linaro.org> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: <44ee5b1f-6c2b-24d2-52db-9c5000dc6461@redhat.com> Date: Fri, 15 Feb 2019 21:21:25 +0100 MIME-Version: 1.0 In-Reply-To: <20190215113707.24553-1-peter.maydell@linaro.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH] hw/arm/armsse: Fix memory leak in error-exit path List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell , qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: patches@linaro.org On 2/15/19 12:37 PM, Peter Maydell wrote: > Coverity points out (CID 1398632, CID 1398650) that we > leak a couple of allocated strings in the error-exit > code path for setting up the MHUs in the ARMSSE. > Fix this bug by moving the allocate-and-free of each > string to be closer to the use, so we do the free before > doing the error-exit check. > > Fixes: f8574705f62b38a ("hw/arm/armsse: Add unimplemented-device stubs for MHUs") > Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé > --- > hw/arm/armsse.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c > index 9a8c49547db..d0207dbabc7 100644 > --- a/hw/arm/armsse.c > +++ b/hw/arm/armsse.c > @@ -762,26 +762,28 @@ static void armsse_realize(DeviceState *dev, Error **errp) > > if (info->has_mhus) { > for (i = 0; i < ARRAY_SIZE(s->mhu); i++) { > - char *name = g_strdup_printf("MHU%d", i); > - char *port = g_strdup_printf("port[%d]", i + 3); > + char *name; > + char *port; > > + name = g_strdup_printf("MHU%d", i); > qdev_prop_set_string(DEVICE(&s->mhu[i]), "name", name); > qdev_prop_set_uint64(DEVICE(&s->mhu[i]), "size", 0x1000); > object_property_set_bool(OBJECT(&s->mhu[i]), true, > "realized", &err); > + g_free(name); > if (err) { > error_propagate(errp, err); > return; > } > + port = g_strdup_printf("port[%d]", i + 3); > mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->mhu[i]), 0); > object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr), > port, &err); > + g_free(port); > if (err) { > error_propagate(errp, err); > return; > } > - g_free(name); > - g_free(port); > } > } > >