From nobody Tue Feb 10 02:43:54 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 151582051829490.82464192110263; Fri, 12 Jan 2018 21:15:18 -0800 (PST) Received: from localhost ([::1]:38947 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaE9s-0005UX-Mq for importer@patchew.org; Sat, 13 Jan 2018 00:15:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47108) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaE2s-0000ak-TL for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:07:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eaE2r-00046p-S4 for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:07:54 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:37871) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eaE2r-00046S-Md for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:07:53 -0500 Received: by mail-qt0-x242.google.com with SMTP id f2so8558406qtj.4 for ; Fri, 12 Jan 2018 21:07:53 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id d26sm5165209qtk.54.2018.01.12.21.07.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jan 2018 21:07:52 -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=MviXOmT5cUyZNTBnmoJ12+XJqylwJh0IMRRuX1MXWeQ=; b=T4PYyrKjFlS5s3V/LU4HEcHN+jFkScAYm1beL6FpFBzq/EOFGMrSTxaIO+ekrJSemh iDWDpWZMeLZD3iB8SG6ejsqpl32anbqsCE7I/j8mnCN9SxRANAveHPw7kowyv6JcrTZn c+u2jQ39uctUxC1F9fCm8hKug0p/ryX+MbAfxiXExO2jBgRmbIr11wjj2YpLeqg5EJZ6 /fJ/SSP6/gP3G6MUVifiUzq9UiRBaLa5ePFyQdQVgJfRcvrxtlK801s+r0KewXcTMUlW BEPeXHQ3zYFO3uhUE2N7mUueVnq8J380VKWOS+Y8fSinwh9nFffoi7d/WcurdFMZmQoe ZZsA== 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=MviXOmT5cUyZNTBnmoJ12+XJqylwJh0IMRRuX1MXWeQ=; b=Q2f58wYplLKFpJXL0A3foYgd8E9bwON8hjASDym66Pn2Vw654jSAmiEADg8BjUsXo2 jrZ/Syh1sWYt1BBekWsj2BD/ZO7Nrwv42iwZBuokmQ5ddT7xwM/SxhqM7Ms7madIlN/m OS/wafNxKAmZiYgCwFBAAb/fVbNyHf3k0E6le5znB2pORqtSTlwaZup5/gqbfokRKXa7 j3Dt2xVl6qyson0xDGPiP06R7zsyCTsxFxMKNC0qwSNx942nQGKoaiidHaAssKgSp4XR jwoW4VycF+hhTBBl74pAF1EX6m3DZ9LlrZKEv5VxX01BKBjbgBY5/2v2zdhy7dTlY8uu WuXg== X-Gm-Message-State: AKwxytec+abw4AeZn02LP3GsT2UIriANOll9gxtNDqTFBr5G9yLeHVsG 1VQZDj3GZ78Hwo/qOdp3YVA= X-Google-Smtp-Source: ACJfBouWVWXRBU3ccR7gNL/SJhRiRr+Le/mhRGk4uD0vFecJd1JMPgDg+Sc/0v68wnaQ/pmepNq2wQ== X-Received: by 10.200.41.131 with SMTP id 3mr39853100qts.247.1515820073335; Fri, 12 Jan 2018 21:07:53 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Sat, 13 Jan 2018 02:07:09 -0300 Message-Id: <20180113050717.22969-7-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180113050717.22969-1-f4bug@amsat.org> References: <20180113050717.22969-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::242 Subject: [Qemu-devel] [PATCH v7 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 , Paolo Bonzini 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 b464143959..ded4fa4885 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 */ @@ -1230,6 +1231,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; @@ -1319,6 +1331,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 @@ -1383,11 +1397,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