Skip to content

Commit 8d62e9b

Browse files
committed
Merge tag 'irq-urgent-2024-04-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fix from Ingo Molnar: "Fix a double free bug in the init error path of the GICv3 irqchip driver" * tag 'irq-urgent-2024-04-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: irqchip/gic-v3-its: Prevent double free on error
2 parents 2c81593 + c26591a commit 8d62e9b

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

drivers/irqchip/irq-gic-v3-its.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4567,13 +4567,8 @@ static int its_vpe_irq_domain_alloc(struct irq_domain *domain, unsigned int virq
45674567
irqd_set_resend_when_in_progress(irq_get_irq_data(virq + i));
45684568
}
45694569

4570-
if (err) {
4571-
if (i > 0)
4572-
its_vpe_irq_domain_free(domain, virq, i);
4573-
4574-
its_lpi_free(bitmap, base, nr_ids);
4575-
its_free_prop_table(vprop_page);
4576-
}
4570+
if (err)
4571+
its_vpe_irq_domain_free(domain, virq, i);
45774572

45784573
return err;
45794574
}

0 commit comments

Comments
 (0)