The following commit has been merged into the x86/irq branch of tip: Commit-ID: 23357b61f8062a8a8c9c84c0252056cd6d849ec8 Gitweb: https://git.kernel.org/tip/23357b61f8062a8a8c9c84c0252056cd6d849ec8 Author: Thomas Gleixner <[email protected]> AuthorDate: Wed, 26 Aug 2020 13:16:29 +02:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 16 Sep 2020 16:52:25 +02:00
iommu/amd: Prevent NULL pointer dereference Dereferencing irq_data before checking it for NULL is suboptimal. Signed-off-by: Thomas Gleixner <[email protected]> Reviewed-by: Joerg Roedel <[email protected]> --- drivers/iommu/amd/iommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c index 07ae8b9..db44ce6 100644 --- a/drivers/iommu/amd/iommu.c +++ b/drivers/iommu/amd/iommu.c @@ -3731,8 +3731,8 @@ static int irq_remapping_alloc(struct irq_domain *domain, unsigned int virq, for (i = 0; i < nr_irqs; i++) { irq_data = irq_domain_get_irq_data(domain, virq + i); - cfg = irqd_cfg(irq_data); - if (!irq_data || !cfg) { + cfg = irq_data ? irqd_cfg(irq_data) : NULL; + if (!cfg) { ret = -EINVAL; goto out_free_data; }
