From nobody Wed Apr 24 04:04:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1585057866; cv=none; d=zohomail.com; s=zohoarc; b=YRDadM0z980qpx/B+DmiP9XH2AvCNecZ2VsgF5yBIzIxXiVF4K7ZYumwQsuFU3RMHlgENP7xzW0JcT3S1POPERhslYZ+KfsLIlhWzbYVUTeyOqAyHLcWAN/SUtY6/3jI4FKyevaqpqDRoxLtFD96kvB3111t7bSyMnYj35o/Ebg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585057866; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GqrPP4sW4bKrCjaavS5T9m3kc5HNFO7tik0hAhfsKeY=; b=Jyh/ZvwbnKoTcvYBBE3K9pHT9x8daZmmpMpcqvy7Z9hcL+TSjfI0vJ1/+yL66gKQANzkJ/fGF6Qo7KhgKA2XJ4Lpha7UMsUoSovj3E7muwnZO0cbh916MAJwmpN8swqmmGnKrBSD3IDfEZJczxPtmdKtLdBdGD/KskpR1QOVMec= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15850578662039.53001964965324; Tue, 24 Mar 2020 06:51:06 -0700 (PDT) Received: from localhost ([::1]:49118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGjxQ-0002UG-VA for importer@patchew.org; Tue, 24 Mar 2020 09:51:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52220) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGjwH-0000t3-As for qemu-devel@nongnu.org; Tue, 24 Mar 2020 09:49:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGjwG-00027C-9F for qemu-devel@nongnu.org; Tue, 24 Mar 2020 09:49:53 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:53544) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jGjwG-00026D-2l for qemu-devel@nongnu.org; Tue, 24 Mar 2020 09:49:52 -0400 Received: by mail-wm1-x342.google.com with SMTP id b12so3270819wmj.3 for ; Tue, 24 Mar 2020 06:49:51 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id k3sm4332067wmf.16.2020.03.24.06.49.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Mar 2020 06:49:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GqrPP4sW4bKrCjaavS5T9m3kc5HNFO7tik0hAhfsKeY=; b=Z9Z+3Gonj2GW1vFcxpVaAkbvqTN8qTAyzdqj0A+WeDx3Cz/EkWfhir19uda75BcmKH i8qxvWSPw0WAnR4sdYINwpViCCYcMEVm6ufVG3XjQ/T+Si0I4YGnbl8in5f+KLeghend xgz7h9qjyP+nwgpvMuPwTBa+/GEkYXR3xUgOsrgFPrOig00OsTdInNmZ4sGz0BXNAvLa ebhUTvVA6VTzNggKhSoNZFZfysVOw6er1c2IEjiN72c02kTiZOhuh/MmT5s92sRAku1P 5i34mRzt/7NevNelTYSoVCWXQIHX1w0Qdy+dDA5LFg3XJOFxxxF28JjS1bKBRCSgHLnG /moQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GqrPP4sW4bKrCjaavS5T9m3kc5HNFO7tik0hAhfsKeY=; b=I/3OZ8QJooImajdFTI81h7WRaBJxEXFrpq8iXt+zXJKnpSMM2ihCyn0MsDMHO7W07/ zAKF5tSDwzo//2Qko/+h4h+odMmhsZ0zqSQXD1KtqXPb1WAqA8lmkDJYD0XxSq5TCl7f 9Ym7kDQTajGYv4FRx9u1Mc91kj+7JjpceTYoi5Qlvet24Toh9klZUPezO8KiC7xWSedy tvDCj+Q443cY35wFluAcO4vFWTuSQtSGQOCRrLJFxUn4JiiEOwoQ1wkkxV/ZHMwgD0/H NjkymTBtuGKXAizMcvd42exX3gjToTWb9OtoIZERzJVZyIvfZpvOaFULjeFoDsMYsLLX paBQ== X-Gm-Message-State: ANhLgQ0P0RjSMMqQKwdbpybgzsJB7f+M+t9zYTxmO2B/vinNH/t4E40A /Ia/5DbJltVl0ETpWDMZZFB0gQ== X-Google-Smtp-Source: ADFU+vu3upNEY5EEgc61bVnXHwhqj89G/3fIiqEzSyYXgS4YgZU1M70Nu4gIrUBjHS5KTC3AMcpD4Q== X-Received: by 2002:a1c:6745:: with SMTP id b66mr5780321wmc.30.1585057791092; Tue, 24 Mar 2020 06:49:51 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 1/2] hw/arm/xlnx-zynqmp.c: Avoid memory leak in error-return path Date: Tue, 24 Mar 2020 13:49:46 +0000 Message-Id: <20200324134947.15384-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200324134947.15384-1-peter.maydell@linaro.org> References: <20200324134947.15384-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E. Iglesias" , Alistair Francis Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" In xlnx_zynqmp_realize() if the attempt to realize the SD controller object fails then the error-return path will leak the 'bus_name' string. Fix this by deferring the allocation until after the realize has succeeded. Fixes: Coverity CID 1421911 Signed-off-by: Peter Maydell Reviewed-by: Alistair Francis Reviewed-by: Edgar E. Iglesias Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/xlnx-zynqmp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index 49f1c8d0de2..a13dbeeacec 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -520,7 +520,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error= **errp) sysbus_connect_irq(SYS_BUS_DEVICE(&s->sata), 0, gic_spi[SATA_INTR]); =20 for (i =3D 0; i < XLNX_ZYNQMP_NUM_SDHCI; i++) { - char *bus_name =3D g_strdup_printf("sd-bus%d", i); + char *bus_name; SysBusDevice *sbd =3D SYS_BUS_DEVICE(&s->sdhci[i]); Object *sdhci =3D OBJECT(&s->sdhci[i]); =20 @@ -541,6 +541,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error= **errp) sysbus_connect_irq(sbd, 0, gic_spi[sdhci_intr[i]]); =20 /* Alias controller SD bus to the SoC itself */ + bus_name =3D g_strdup_printf("sd-bus%d", i); object_property_add_alias(OBJECT(s), bus_name, sdhci, "sd-bus", &error_abort); g_free(bus_name); --=20 2.20.1 From nobody Wed Apr 24 04:04:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1585057865; cv=none; d=zohomail.com; s=zohoarc; b=Tr6uhOeUixKBnFS3Cy06wq17eTgOilCTNE2BhZaaHZM/5cyZrnwGc1z5hFvGT5vUlT554Hts5o8egugGMSkS1jaZzcJJMS2hRhiriSEjo8ZhqpVH6UER4oTMwWzav0PCXVR9d0WwV39ApJO4dfrbBIZicKkCFzzyPz5R+NwYDvA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585057865; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bE22CGlWWqUPL8NcmKjZG+N4XUlNXckt3+kKgAcyxzY=; b=FFp84i/eCv191DFBgktc2wn2OU/fxgqqu6gDL9KCURvmglj62YMPYNnwWDdlamyiazicc4PAyAPD23LsvGI5DukpbEtW1KwM/ugt72APAQuTH2X7G4wJwmk24Vhe66JRM3Nszpw6Xid6vf/9zQTHY42XVVNedKKl1Imvaxdcr1Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585057865901866.5952670022143; Tue, 24 Mar 2020 06:51:05 -0700 (PDT) Received: from localhost ([::1]:49122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGjxQ-0002VW-Mc for importer@patchew.org; Tue, 24 Mar 2020 09:51:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52252) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGjwI-0000tX-FZ for qemu-devel@nongnu.org; Tue, 24 Mar 2020 09:49:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGjwH-00029H-G0 for qemu-devel@nongnu.org; Tue, 24 Mar 2020 09:49:54 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:34584) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jGjwH-00027w-9m for qemu-devel@nongnu.org; Tue, 24 Mar 2020 09:49:53 -0400 Received: by mail-wr1-x42b.google.com with SMTP id 65so4822811wrl.1 for ; Tue, 24 Mar 2020 06:49:53 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id k3sm4332067wmf.16.2020.03.24.06.49.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Mar 2020 06:49:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bE22CGlWWqUPL8NcmKjZG+N4XUlNXckt3+kKgAcyxzY=; b=EG+Xfc3LqvAQjBcs5BovLBfw1GEfhFecLp2IVF2O1rfNiIfTzNR1X09FUaT64KisjG bKna6v1cu/ZLL/Y9d24895gkYk7yAPQa6Q+UREMvPmyh/41/sJzUVByd8hFlZGwLBydS co0VjUTRZfeWTNiY/H/aDXFRGC5vwp4NxGWLkHaJ/XqW/kBPOboRqZXiVykuXzDIh2X4 SYHH3J3N7u206eeTi1KkBvG2ulunbPU9tSezIsZ3Gu0y41/Fb6l/RM3DxHaTRXXuEoGh M5R+A1JhbLK508AF5WKno6vZDlJ1k1Xw0qp8E0My0tPMLvYQLTvN/mmHj/5T3JbyGLqr nIQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bE22CGlWWqUPL8NcmKjZG+N4XUlNXckt3+kKgAcyxzY=; b=hC6YaNgokVdmqX5e47Mp7g8GCtzTbNQu+2gfLL2cILSGu6Y+fI+pm+4wBCP2GOaTao rXoLyf1FKH6JisYiyCn6ci18eOjqY28Md9PE8gYXSNUcxdMdDbzbpqrl37FD02ofYIV4 +nrhUxUC+8Sz6IhRfK7/PQiUUcappnXyx+Ef4vhzXgR2gi6Z4D8jyR0LlD2uBLu5Nc8m 0mcW/aM3c1NFdo/DGHWkxfqYjTAmapxHPlo8NwoxFyJoH+mZ/MTu7ZwUq2ISxXLZPnmc oexuX2HSh87IhtSJI5BxBzYTwcJbik60SFBWGVtMUhsb9OzfWgi5DazEzRSK7gqRMKo3 sx+w== X-Gm-Message-State: ANhLgQ0/QDuEtz0ryCjP9gHd4LG5zeopmjtUSxf+1cFCXTo1mPylRntD fcGxG4XigA6cUM3538TmcjTR9Q== X-Google-Smtp-Source: ADFU+vtF47Tc8g7QOWs9dRT1JxNcXUSbBKYz7VvRNLC5xWC+isvBC4SrpcGZXW6uYIDM744H/OkQhg== X-Received: by 2002:adf:e98b:: with SMTP id h11mr17446177wrm.409.1585057792255; Tue, 24 Mar 2020 06:49:52 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 2/2] hw/arm/xlnx-zynqmp.c: Add missing error-propagation code Date: Tue, 24 Mar 2020 13:49:47 +0000 Message-Id: <20200324134947.15384-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200324134947.15384-1-peter.maydell@linaro.org> References: <20200324134947.15384-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42b X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E. Iglesias" , Alistair Francis Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" In some places in xlnx_zynqmp_realize() we were putting an error into our local Error*, but forgetting to check for failure and pass it back to the caller. Add the missing code. Signed-off-by: Peter Maydell Reviewed-by: Alistair Francis Reviewed-by: Edgar E. Iglesias --- Spotted while I was writing the previous patch. --- hw/arm/xlnx-zynqmp.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index a13dbeeacec..b84d153d56a 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -530,8 +530,20 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Erro= r **errp) * - eMMC Specification Version 4.51 */ object_property_set_uint(sdhci, 3, "sd-spec-version", &err); + if (err) { + error_propagate(errp, err); + return; + } object_property_set_uint(sdhci, SDHCI_CAPABILITIES, "capareg", &er= r); + if (err) { + error_propagate(errp, err); + return; + } object_property_set_uint(sdhci, UHS_I, "uhs", &err); + if (err) { + error_propagate(errp, err); + return; + } object_property_set_bool(sdhci, true, "realized", &err); if (err) { error_propagate(errp, err); @@ -551,6 +563,10 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Erro= r **errp) gchar *bus_name; =20 object_property_set_bool(OBJECT(&s->spi[i]), true, "realized", &er= r); + if (err) { + error_propagate(errp, err); + return; + } =20 sysbus_mmio_map(SYS_BUS_DEVICE(&s->spi[i]), 0, spi_addr[i]); sysbus_connect_irq(SYS_BUS_DEVICE(&s->spi[i]), 0, @@ -565,6 +581,10 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Erro= r **errp) } =20 object_property_set_bool(OBJECT(&s->qspi), true, "realized", &err); + if (err) { + error_propagate(errp, err); + return; + } sysbus_mmio_map(SYS_BUS_DEVICE(&s->qspi), 0, QSPI_ADDR); sysbus_mmio_map(SYS_BUS_DEVICE(&s->qspi), 1, LQSPI_ADDR); sysbus_connect_irq(SYS_BUS_DEVICE(&s->qspi), 0, gic_spi[QSPI_IRQ]); @@ -619,6 +639,10 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Erro= r **errp) =20 for (i =3D 0; i < XLNX_ZYNQMP_NUM_GDMA_CH; i++) { object_property_set_uint(OBJECT(&s->gdma[i]), 128, "bus-width", &e= rr); + if (err) { + error_propagate(errp, err); + return; + } object_property_set_bool(OBJECT(&s->gdma[i]), true, "realized", &e= rr); if (err) { error_propagate(errp, err); --=20 2.20.1