From patchwork Tue Mar 24 13:49:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 1260678 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=Z9Z+3Gon; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48mt1N6zS3z9sVW for ; Wed, 25 Mar 2020 00:50:32 +1100 (AEDT) Received: from localhost ([::1]:49092 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGjws-0001EQ-Sk for incoming@patchwork.ozlabs.org; Tue, 24 Mar 2020 09:50:30 -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) 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) 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) 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 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- 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]); for (i = 0; i < XLNX_ZYNQMP_NUM_SDHCI; i++) { - char *bus_name = g_strdup_printf("sd-bus%d", i); + char *bus_name; SysBusDevice *sbd = SYS_BUS_DEVICE(&s->sdhci[i]); Object *sdhci = OBJECT(&s->sdhci[i]); @@ -541,6 +541,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) sysbus_connect_irq(sbd, 0, gic_spi[sdhci_intr[i]]); /* Alias controller SD bus to the SoC itself */ + bus_name = g_strdup_printf("sd-bus%d", i); object_property_add_alias(OBJECT(s), bus_name, sdhci, "sd-bus", &error_abort); g_free(bus_name);