From nobody Tue Oct 28 04:17:45 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 1515003040922389.53827445733; Wed, 3 Jan 2018 10:10:40 -0800 (PST) Received: from localhost ([::1]:60026 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnUt-0001mQ-SF for importer@patchew.org; Wed, 03 Jan 2018 13:10:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47809) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnSt-0000RI-E0 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWnSs-0006zM-7n for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:35 -0500 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:39480) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWnSs-0006z9-33 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:34 -0500 Received: by mail-qk0-x244.google.com with SMTP id c5so2553608qkg.6 for ; Wed, 03 Jan 2018 10:08:34 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 46sm914901qtx.65.2018.01.03.10.08.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 10:08:33 -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=s0RktmE+TDd81TKZ+zwrIZN0pKqxOsiPP56H9HHlJvo=; b=YW23PsojWTSafl7lQqh6cYhqmAquZT0T5+WLsp9KkhU9cPZChQdRLAACbNTXWKya/n iBol+FgfGEU85f5Lz0mI1Tep5XExJXCOInJTyJDxUlAWixwS7K3V59ioYOGhTo+xMDd8 OQmZ4i4zVhfVOSbuIwUSzrHdAjmoTDUA3qx+WTFkcOu/9nFmGWPC26b2Dl8IVfzHyJvj DtSd/JSASsF9zw8/D5EI/8tPehcLS/NGPL60WmbyscJVl/f0B8lkvsIwuw8rpb0ZrE+K RoHzfw5oxW0PsQPl77QhLCFGm1rLiKe9SJaHK1tUb8iLPac5tqfj1pv921IKF+5k7MjH jJaA== 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=s0RktmE+TDd81TKZ+zwrIZN0pKqxOsiPP56H9HHlJvo=; b=Broucmqk4OmWZfL2k2fFNH7XMZ4UNTF5JWIcxc314Oa2MUKvu/DtbfpBZBCFhKvVap OKja/I8FncX+f5Dve3pX/dBc52hoJg4Z+0GIFIkHLuowrC1g5mqXktXI2C1mxqJUDmSz oIAxQhtiW2pFAHwYJq8OIHQhj/uEE2q2ptZSMRjONDPtqaj4QACGHSG4ujZdk+uaYj2G kyuA7Uhl4evEIGeY8GD0Q8v7OiXvfyQQ8FPFdv+/P1SqjAfB+4hMbyWnq5I9Tlna/1c2 HCMlqxu980WU0cuGMiKf3GJrRcmtWSqfB1ifa0N2yF21d63O1IrqzvBdl3ZzSSeCsuM2 LiTA== X-Gm-Message-State: AKGB3mL/t5GClXzCRqccJnvpiMNOdEiJoWrSy1LQ543QrVHiUgxVkiJU U6oYGX17PrhMo8a16q6yrZY= X-Google-Smtp-Source: ACJfBosJWpFx4GEY6D/GMWUzMuVBanFN3Mrl4ScngjRdQ860fKqsGmHySsuryhlCNRkmtJN8qQeKBA== X-Received: by 10.55.124.7 with SMTP id x7mr2921549qkc.133.1515002913717; Wed, 03 Jan 2018 10:08:33 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Fam Zheng Date: Wed, 3 Jan 2018 15:07:55 -0300 Message-Id: <20180103180805.18140-8-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103180805.18140-1-f4bug@amsat.org> References: <20180103180805.18140-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:c09::244 Subject: [Qemu-devel] [PATCH v5 07/17] sdhci: refactor common sysbus/pci unrealize() into sdhci_common_unrealize() 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 b3dbd994fd..089961bd66 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -31,6 +31,7 @@ #include "qemu/bitops.h" #include "hw/sd/sdhci.h" #include "sdhci-internal.h" +#include "qapi/error.h" #include "qemu/log.h" =20 /* host controller debug messages */ @@ -1203,15 +1204,23 @@ static void sdhci_common_realize(SDHCIState *s, Err= or **errp) SDHC_REGISTERS_MAP_SIZE); } =20 +static void sdhci_common_unrealize(SDHCIState *s, Error **errp) +{ + /* 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!). */ + g_free(s->fifo_buffer); + 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) @@ -1315,6 +1324,8 @@ static void sdhci_pci_realize(PCIDevice *dev, Error *= *errp) static void sdhci_pci_exit(PCIDevice *dev) { SDHCIState *s =3D PCI_SDHCI(dev); + + sdhci_common_unrealize(s, &error_abort); sdhci_uninitfn(s); } =20 @@ -1371,11 +1382,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_common_unrealize(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_common_class_init(klass, data); } --=20 2.15.1