From nobody Tue Feb 10 15:44:27 2026 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 1516040838271923.0547046784061; Mon, 15 Jan 2018 10:27:18 -0800 (PST) Received: from localhost ([::1]:53172 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb9TZ-0001Gc-Ba for importer@patchew.org; Mon, 15 Jan 2018 13:27:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60126) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb9RY-0008PG-8b for qemu-devel@nongnu.org; Mon, 15 Jan 2018 13:25:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eb9RV-00035v-4A for qemu-devel@nongnu.org; Mon, 15 Jan 2018 13:25:12 -0500 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:43900) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eb9RU-00035m-W3 for qemu-devel@nongnu.org; Mon, 15 Jan 2018 13:25:09 -0500 Received: by mail-qk0-x242.google.com with SMTP id a5so15079274qkg.10 for ; Mon, 15 Jan 2018 10:25:08 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id d20sm154623qtn.23.2018.01.15.10.25.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Jan 2018 10:25:07 -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=hXdyHxnA3xK1HeagzMUFfxECoANEcP6zfcE8dXKo9F8=; b=JBvR2UgzyljF1sCH1oAcR3gt8GXAQ8zT6Kzrb2OG71Ek7SKSQX0dxY8MXElsfln5Bz KgVCnsPIfb26HKJEXumLVNVyfvhRUdPw5y7Jpr9Kq0787gIZ4ZyH2rbYkTafRpXYSkz1 YwCovEr7HwIX7OHBMl1P4YKSitKZMlkThJFYSKxvyjg+4NeZuxORzVIRB5GJiVKD9cVJ ryUo226JyuNbUtxZjqXE6OEJ3C11H/h/kZywsqKqZKY/5hh+lWiP+surCCqXHqhI1vg3 dKwc956onApBDNFvk4MsiPa5Gv9enXwwQIhlHF7nIdWWW4VNYEdcavNvBB4ZFiOryH25 L5sA== 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=hXdyHxnA3xK1HeagzMUFfxECoANEcP6zfcE8dXKo9F8=; b=QFll3pOmw/IL5tgXuswZ1LLcfaFVjpuel1Gm5edMyHdKx3B6/KeqW3ADf0SiOmj4+w wPYUWJ8h3gb4xaMOXs4bt/s7NOqS0bRn3QQd/CO+dZjUTFBiXjtNZ3P4YGDhnnalKgke IKSHgxkTRqY/zojrdLyhZQwgNLHoiAyWwbdXgOMaghXXaBh/6kSAku2OvAQ9iOyZlxIG NX4TU3c20O6NRNb2YH4iop/HqCG5GgaN2/2yWgACCdlW3KymXukeF88yyYvm3BSj/DCr mKRfXwl3VxGiN5mXcdonz+WfhDqSdTxMZQ3h52L1eYePx7OmqZEQBJ0erxFFrQLfw7KK Urlg== X-Gm-Message-State: AKwxytfnyO+bXJQpjwm/cBQ7wulPM/x63XQ9EdWa/R1VnbQIKPPiD16/ bbr6h+7MxxcspAo3Y6G7AIA= X-Google-Smtp-Source: ACJfBosavEF1dn2wv0BmOd8pUEjhu5cEuNSAvBslHjLLeGVSXw1AztonK35Jf9Y0ve9CgZYS0NUlkw== X-Received: by 10.55.3.148 with SMTP id 142mr39095918qkd.277.1516040708473; Mon, 15 Jan 2018 10:25:08 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , Alistair Francis , Peter Maydell Date: Mon, 15 Jan 2018 15:24:28 -0300 Message-Id: <20180115182436.2066-7-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180115182436.2066-1-f4bug@amsat.org> References: <20180115182436.2066-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::242 Subject: [Qemu-devel] [PATCH v8 06/14] 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" , Andrey Smirnov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Kevin O'Connor , Marcel Apfelbaum 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 Reviewed-by: Alistair Francis --- hw/sd/sdhci.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index cf0c079990..bbe4570326 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -32,6 +32,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 */ @@ -1223,6 +1224,17 @@ static void sdhci_common_realize(SDHCIState *s, Erro= r **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 bool sdhci_pending_insert_vmstate_needed(void *opaque) { SDHCIState *s =3D opaque; @@ -1317,6 +1329,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 @@ -1382,12 +1396,20 @@ 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->props =3D sdhci_sysbus_properties; dc->realize =3D sdhci_sysbus_realize; + dc->unrealize =3D sdhci_sysbus_unrealize; =20 sdhci_common_class_init(klass, data); } --=20 2.15.1