From: Anthony PERARD via <qemu-devel@nongnu.org>
To: <qemu-devel@nongnu.org>
Cc: Bernhard Beschow <shentey@gmail.com>,
Anthony PERARD <anthony.perard@citrix.com>
Subject: [PULL 06/12] hw/pci/pci.c: Don't leak PCIBus::irq_count[] in pci_bus_irqs()
Date: Wed, 7 Jun 2023 15:18:33 +0100 [thread overview]
Message-ID: <20230607141839.48422-7-anthony.perard@citrix.com> (raw)
In-Reply-To: <20230607141839.48422-1-anthony.perard@citrix.com>
From: Bernhard Beschow <shentey@gmail.com>
When calling pci_bus_irqs() multiple times on the same object without calling
pci_bus_irqs_cleanup() in between PCIBus::irq_count[] is currently leaked.
Let's fix this because Xen will do just that in a few commits, and because
calling pci_bus_irqs_cleanup() in between seems fragile and cumbersome.
Note that pci_bus_irqs_cleanup() now has to NULL irq_count such that
pci_bus_irqs() doesn't do a double free.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Chuck Zmudzinski <brchuckz@aol.com>
Message-Id: <20230403074124.3925-3-shentey@gmail.com>
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
hw/pci/pci.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 1cc7c89036..9b7b4d7c18 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -560,6 +560,7 @@ void pci_bus_irqs(PCIBus *bus, pci_set_irq_fn set_irq,
bus->set_irq = set_irq;
bus->irq_opaque = irq_opaque;
bus->nirq = nirq;
+ g_free(bus->irq_count);
bus->irq_count = g_malloc0(nirq * sizeof(bus->irq_count[0]));
}
@@ -575,6 +576,7 @@ void pci_bus_irqs_cleanup(PCIBus *bus)
bus->irq_opaque = NULL;
bus->nirq = 0;
g_free(bus->irq_count);
+ bus->irq_count = NULL;
}
PCIBus *pci_register_root_bus(DeviceState *parent, const char *name,
--
Anthony PERARD
next prev parent reply other threads:[~2023-06-07 14:21 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-07 14:18 [PULL 00/12] xen queue Anthony PERARD via
2023-06-07 14:18 ` [PULL 01/12] hw/xen: Simplify emulated Xen platform init Anthony PERARD via
2023-06-07 14:18 ` [PULL 02/12] hw/xen: Fix memory leak in libxenstore_open() for Xen Anthony PERARD via
2023-06-07 14:18 ` [PULL 03/12] xen: Drop support for Xen versions below 4.7.1 Anthony PERARD via
2023-06-07 14:18 ` [PULL 04/12] hw/xen: Fix broken check for invalid state in xs_be_open() Anthony PERARD via
2023-06-07 14:18 ` [PULL 05/12] include/hw/xen/xen: Rename xen_piix3_set_irq() to xen_intx_set_irq() Anthony PERARD via
2023-06-07 14:18 ` Anthony PERARD via [this message]
2023-06-07 14:18 ` [PULL 07/12] hw/isa/piix3: Reuse piix3_realize() in piix3_xen_realize() Anthony PERARD via
2023-06-07 14:18 ` [PULL 08/12] hw/isa/piix3: Wire up Xen PCI IRQ handling outside of PIIX3 Anthony PERARD via
2023-06-07 14:18 ` [PULL 09/12] hw/isa/piix3: Avoid Xen-specific variant of piix3_write_config() Anthony PERARD via
2023-06-07 14:18 ` [PULL 10/12] hw/isa/piix3: Resolve redundant k->config_write assignments Anthony PERARD via
2023-06-07 14:18 ` [PULL 11/12] hw/isa/piix3: Resolve redundant TYPE_PIIX3_XEN_DEVICE Anthony PERARD via
2023-06-07 14:18 ` [PULL 12/12] xen-block: fix segv on unrealize Anthony PERARD via
2023-06-07 14:48 ` [PULL 00/12] xen queue Michael Tokarev
2023-06-07 18:42 ` Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230607141839.48422-7-anthony.perard@citrix.com \
--to=qemu-devel@nongnu.org \
--cc=anthony.perard@citrix.com \
--cc=shentey@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).