Skip to content

Commit d5c647b

Browse files
covanambjorn-helgaas
authored andcommitted
PCI: vmd: Fix wrong kfree() in vmd_msi_free()
vmd_msi_alloc() allocates struct vmd_irq and stashes it into irq_data->chip_data associated with the VMD's interrupt domain. vmd_msi_free() extracts the pointer by calling irq_get_chip_data() and frees it. irq_get_chip_data() returns the chip_data associated with the top interrupt domain. This worked in the past because VMD's interrupt domain was the top domain. But d7d8ab8 ("PCI: vmd: Switch to msi_create_parent_irq_domain()") changed the interrupt domain hierarchy so VMD's interrupt domain is not the top domain anymore. irq_get_chip_data() now returns the chip_data at the MSI devices' interrupt domains. It is therefore broken for vmd_msi_free() to kfree() this chip_data. Fix by extracting the chip_data associated with the VMD's interrupt domain. Fixes: d7d8ab8 ("PCI: vmd: Switch to msi_create_parent_irq_domain()") Reported-by: Kenneth Crudup <[email protected]> Closes: https://lore.kernel.org/linux-pci/[email protected]/ Reported-by: Ammar Faizi <[email protected]> Closes: https://lore.kernel.org/linux-pci/ed53280ed15d1140700b96cca2734bf327ee92539e5eb68e80f5bbbf0f01@linux.gnuweeb.org/ Tested-by: Ammar Faizi <[email protected]> Tested-by: Kenneth Crudup <[email protected]> Signed-off-by: Nam Cao <[email protected]> Signed-off-by: Bjorn Helgaas <[email protected]> Reviewed-by: Thomas Gleixner <[email protected]> Reviewed-by: Jinjie Ruan <[email protected]> Acked-by: Manivannan Sadhasivam <[email protected]> Link: https://patch.msgid.link/[email protected]
1 parent 0bd0a41 commit d5c647b

File tree

1 file changed

+3
-1
lines changed
  • drivers/pci/controller

1 file changed

+3
-1
lines changed

drivers/pci/controller/vmd.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,10 +280,12 @@ static int vmd_msi_alloc(struct irq_domain *domain, unsigned int virq,
280280
static void vmd_msi_free(struct irq_domain *domain, unsigned int virq,
281281
unsigned int nr_irqs)
282282
{
283+
struct irq_data *irq_data;
283284
struct vmd_irq *vmdirq;
284285

285286
for (int i = 0; i < nr_irqs; ++i) {
286-
vmdirq = irq_get_chip_data(virq + i);
287+
irq_data = irq_domain_get_irq_data(domain, virq + i);
288+
vmdirq = irq_data->chip_data;
287289

288290
synchronize_srcu(&vmdirq->irq->srcu);
289291

0 commit comments

Comments
 (0)