From nobody Tue Oct 28 12:16:34 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 15149776964511013.37163338577; Wed, 3 Jan 2018 03:08:16 -0800 (PST) Received: from localhost ([::1]:48690 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWgu7-0008Ee-JJ for importer@patchew.org; Wed, 03 Jan 2018 06:08:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47807) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWgo0-00036c-Ad for qemu-devel@nongnu.org; Wed, 03 Jan 2018 06:01:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWgnz-0005sm-EO for qemu-devel@nongnu.org; Wed, 03 Jan 2018 06:01:56 -0500 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:39877) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWgnz-0005sE-B4 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 06:01:55 -0500 Received: by mail-qt0-x241.google.com with SMTP id k19so1630924qtj.6 for ; Wed, 03 Jan 2018 03:01:55 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id r55sm417735qta.57.2018.01.03.03.01.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 03:01:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qLEuThj4XZSTmyQn2kuSHrI5fo75O9QKdnY/RkSq/hE=; b=YghN+aqNShlBL1KFqL2uDtReBu29q/83yZPmqQgSP/iVrEJDxs/wyLbrwhXMnVPqLL 8KGArjEmcMV8GnAv8fGqUeB/IeFbXU1VLnppwfmPfQSuWeS/3hyLiKz4U11oVr2bVPdG JnortzzOB3D177Gue58Uz850zdlgx+bsezvvUG7WMB50a3tf5JqeLb7AcocIXNMfRAbQ 5mBz3CI9bCClT7sYcgWAcYNYTicsgm/Y5HrnFNH3mPdTktrmWzEMrgR1u+ZYsfA+n4RG OtPkqlDm4BdBO7dBlF9BUaWcRaNe7wXP7mHYt3hKa+vXZd4vINn1t9SvoPkKp5BlrWhE rLfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=qLEuThj4XZSTmyQn2kuSHrI5fo75O9QKdnY/RkSq/hE=; b=CShhv+I0KTs2hUGrAxgLNq/ptRL6PxZXPVuBSIponcbcXenzw63Sm/JwljSu3EqFOv YeMhSg21TPvmLiHC/HHg3uDOj4+VOGKgp4JbW/Ljj7jWT1y4bD6RPfVXPUZvWrdIKBag dUkaVtap/UxwQJzXJJbMFHJWojkT7+Ov7GLxNUXJFN356/deCvdgptGJgUhvXswGohps AC6wsMuA3D4g9T9lbPja8VcJRMRTWaWZHjstEW+qVVSay97zRyGkxYhEau1+mYjUIl86 t9KU7X08rxCwSmPOgZkp/dI804YXsVW0kpLK2BlWKsv7NHnChPfMQneZLBGtG+lM/91r 5e7Q== X-Gm-Message-State: AKGB3mJwAuIGQl00y0WXjl/Mc+5lN2YPwEu++pSe0Fxu+Vpm74rNAFVI x+in5DrOpsExlHaaESYOqJM= X-Google-Smtp-Source: ACJfBot8PA6MK5L0R3wHpLHfFRs8iXdt4c71v/dLxcNQ93POV+lohOCWbGNiztN0rZmo+XwERgiLVw== X-Received: by 10.200.0.141 with SMTP id c13mr1192492qtg.96.1514977314757; Wed, 03 Jan 2018 03:01:54 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Fam Zheng Date: Wed, 3 Jan 2018 08:01:16 -0300 Message-Id: <20180103110126.29209-8-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103110126.29209-1-f4bug@amsat.org> References: <20180103110126.29209-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::241 Subject: [Qemu-devel] [PATCH v4 07/17] sdhci: refactor common sysbus/pci unrealize() into sdhci_unrealizefn() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , Peter Maydell , Eduardo Habkost , Andrey Smirnov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sdhci.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index d5c6d8ab0b..967521d347 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -32,6 +32,7 @@ #include "qapi/error.h" #include "hw/sd/sdhci.h" #include "sdhci-internal.h" +#include "qapi/error.h" #include "qemu/log.h" =20 /* host controller debug messages */ @@ -1204,15 +1205,23 @@ static void sdhci_realizefn(SDHCIState *s, Error **= errp) SDHC_REGISTERS_MAP_SIZE); } =20 +static void sdhci_unrealizefn(SDHCIState *s, Error **errp) +{ + g_free(s->fifo_buffer); + /* This function is expected to be called only once for each class: + * - SysBus: via DeviceClass->unrealize(), + * - PCI: via PCIDeviceClass->exit(). + * However to avoid double-free and/or use-after-free we still nullify + * this variable (better safe than sorry!). */ + s->fifo_buffer =3D NULL; +} + static void sdhci_uninitfn(SDHCIState *s) { timer_del(s->insert_timer); timer_free(s->insert_timer); timer_del(s->transfer_timer); timer_free(s->transfer_timer); - - g_free(s->fifo_buffer); - s->fifo_buffer =3D NULL; } =20 static bool sdhci_pending_insert_vmstate_needed(void *opaque) @@ -1318,6 +1327,8 @@ static void sdhci_pci_realize(PCIDevice *dev, Error *= *errp) static void sdhci_pci_exit(PCIDevice *dev) { SDHCIState *s =3D PCI_SDHCI(dev); + + sdhci_unrealizefn(s, &error_abort); sdhci_uninitfn(s); } =20 @@ -1376,11 +1387,19 @@ static void sdhci_sysbus_realize(DeviceState *dev, = Error ** errp) sysbus_init_mmio(sbd, &s->iomem); } =20 +static void sdhci_sysbus_unrealize(DeviceState *dev, Error **errp) +{ + SDHCIState *s =3D SYSBUS_SDHCI(dev); + + sdhci_unrealizefn(s, &error_abort); +} + static void sdhci_sysbus_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); =20 dc->realize =3D sdhci_sysbus_realize; + dc->unrealize =3D sdhci_sysbus_unrealize; =20 sdhci_class_init(klass, data); } --=20 2.15.1