Commit e256a7cd authored Jan 05, 2021 by Dinghao Liu Committed by Greg Kroah-Hartman Jan 17, 2021

iommu/intel: Fix memleak in intel_irq_remapping_alloc



commit ff2b46d7cff80d27d82f7f3252711f4ca1666129 upstream.

When irq_domain_get_irq_data() or irqd_cfg() fails
at i == 0, data allocated by kzalloc() has not been
freed before returning, which leads to memleak.

Fixes: b106ee63 ("irq_remapping/vt-d: Enhance Intel IR driver to support hierarchical irqdomains")
Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
Acked-by: Lu Baolu <baolu.lu@linux.intel.com>
Link: https://lore.kernel.org/r/20210105051837.32118-1-dinghao.liu@zju.edu.cn


Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 7ee944e9

drivers/iommu/intel_irq_remapping.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1373,6 +1373,8 @@ static int intel_irq_remapping_alloc(struct irq_domain *domain,
	irq_data = irq_domain_get_irq_data(domain, virq + i);		irq_data = irq_domain_get_irq_data(domain, virq + i);
	irq_cfg = irqd_cfg(irq_data);		irq_cfg = irqd_cfg(irq_data);
	if (!irq_data \|\| !irq_cfg) {		if (!irq_data \|\| !irq_cfg) {
			if (!i)
			kfree(data);
	ret = -EINVAL;		ret = -EINVAL;
	goto out_free_data;		goto out_free_data;
	}		}