From nobody Tue Feb 10 20:14:39 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 1515699462621566.495626317757; Thu, 11 Jan 2018 11:37:42 -0800 (PST) Received: from localhost ([::1]:36652 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZifT-0008Iw-P5 for importer@patchew.org; Thu, 11 Jan 2018 14:37:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44784) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZiYt-0002r0-8p for qemu-devel@nongnu.org; Thu, 11 Jan 2018 14:30:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eZiYp-0005WI-Fj for qemu-devel@nongnu.org; Thu, 11 Jan 2018 14:30:51 -0500 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:40387) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eZiYp-0005Va-C6 for qemu-devel@nongnu.org; Thu, 11 Jan 2018 14:30:47 -0500 Received: by mail-qk0-x243.google.com with SMTP id d18so5749417qke.7 for ; Thu, 11 Jan 2018 11:30:47 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id i37sm4870538qtc.80.2018.01.11.11.30.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Jan 2018 11:30:46 -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=sHpWZj09QVBhRyfzswe5eUDwJzu+tx9e7gydEzw5JWw=; b=VyqOTb0RMYdkxWkogHB9c+/JJK4TDAa52+H+R0yVFIEIN1XP1R4zGY4/Qmj/6tHbi7 6DQc0hoH8rm9/RoTv9ksliuPWdaNWAnlrzxp/k1Zk9QaMR8aFcZd85GF3Iax3kkMBvux oHDmx3SM0MehuI3Bxo+lGU+/neJbVt1hW7NTUEsYzT/I5ggULhlvv+FTTPml4y8FZa/8 ptLJ7f2h+vn+zqsF0oSYeoKXWqV18AzoMYrvB7cFYRUvrZ0OO164hL8hWeIJE4nYnZh6 rDypWjNKdg/m1s3rnyVKQzdPYFk+zR917Fj4Yu4WOgdP1R0TQ/9ouxvqcTDTtYN5z3sn QHyQ== 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=sHpWZj09QVBhRyfzswe5eUDwJzu+tx9e7gydEzw5JWw=; b=MZi0U1JQS0YXUODsKxxFC9LsRLwMQSM8mjwT5+e3qYjpRh5NzZCtr2fl3EC39CkOot 6wBpU8X+S0x4MI72bc6JSTyWYRXvx8UGRoBo0F9vLtQ0K87iyqU7VS/cb+H02Tdu0LBw IYjYEY6EF1g8+P9iCacbNDXbVw7FT58zjKTfQ7F5BfsfiEsFzuQPZr9/Zhc78opcY69M d73AoRr3lcsn2QwHaSW2gfk2TyvqgI6gpaY4ZSODpL3mfbqQUo0slG95USSxyebtNqSP u1o+gfExW9VZSuWDG6yNrYhtCOBGaWeqGmngGbyvJ3k/lhOMNKf8HzVlF+ZFft095OTD jehA== X-Gm-Message-State: AKwxytcOyOB59l6vMpv3rSEQ3ivIm4HsepVdxhdzO9r6HsCk7XSrXejf w5hqTcc7rfxj0zjKj7GIHxo= X-Google-Smtp-Source: ACJfBot7/4xMCsAh3rSSUlgfCm4D4N2YbqzDmjiJXcrhcL6JdSHWoqhSKz2H1hWtvbvxNnkvXWVsZQ== X-Received: by 10.55.118.196 with SMTP id r187mr17798203qkc.131.1515699046813; Thu, 11 Jan 2018 11:30:46 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Thu, 11 Jan 2018 16:30:14 -0300 Message-Id: <20180111193021.17466-7-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180111193021.17466-1-f4bug@amsat.org> References: <20180111193021.17466-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::243 Subject: [Qemu-devel] [PATCH v6 06/13] 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 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 | 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