diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-01-11 08:09:25 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-01-11 08:09:25 +0100 |
commit | 591afd6e5a5045a7c0fe3fc6a26c55d8030bbf9f (patch) | |
tree | 9028c6bdb3b5a2536b74deeaa4901f94ba7a3b84 /drivers/iommu/intel/irq_remapping.c | |
parent | 59b26d2e96c473b7b65cfe19381444d034e91715 (diff) | |
parent | 7c53f6b671f4aba70ff15e1b05148b10d58c2837 (diff) |
Merge 5.11-rc3 into char-misc-next
We need the char/misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iommu/intel/irq_remapping.c')
-rw-r--r-- | drivers/iommu/intel/irq_remapping.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/iommu/intel/irq_remapping.c b/drivers/iommu/intel/irq_remapping.c index aeffda92b10b..685200a5cff0 100644 --- a/drivers/iommu/intel/irq_remapping.c +++ b/drivers/iommu/intel/irq_remapping.c @@ -1353,6 +1353,8 @@ static int intel_irq_remapping_alloc(struct irq_domain *domain, 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; } |