| From ff2b46d7cff80d27d82f7f3252711f4ca1666129 Mon Sep 17 00:00:00 2001 |
| From: Dinghao Liu <dinghao.liu@zju.edu.cn> |
| Date: Tue, 5 Jan 2021 13:18:37 +0800 |
| Subject: iommu/intel: Fix memleak in intel_irq_remapping_alloc |
| |
| From: Dinghao Liu <dinghao.liu@zju.edu.cn> |
| |
| 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: b106ee63abcc ("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> |
| |
| --- |
| drivers/iommu/intel_irq_remapping.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/drivers/iommu/intel_irq_remapping.c |
| +++ b/drivers/iommu/intel_irq_remapping.c |
| @@ -1350,6 +1350,8 @@ static int intel_irq_remapping_alloc(str |
| irq_data = irq_domain_get_irq_data(domain, virq + i); |
| irq_cfg = irqd_cfg(irq_data); |
| if (!irq_data || !irq_cfg) { |
| + if (!i) |
| + kfree(data); |
| ret = -EINVAL; |
| goto out_free_data; |
| } |
