diff mbox series

MIPS: SGI-IP30: Check for valid pointer before using it

Message ID 20200122131334.21970-1-tbogendoerfer@suse.de (mailing list archive)
State Mainlined
Commit c0e79fd89749b0cda1c72049e2772dd2eeada86f
Delegated to: Paul Burton
Headers show
Series MIPS: SGI-IP30: Check for valid pointer before using it | expand

Commit Message

Thomas Bogendoerfer Jan. 22, 2020, 1:13 p.m. UTC
Fix issue detected by Smatch:

    ./arch/mips/sgi-ip30/ip30-irq.c:236 heart_domain_free()
     warn: variable dereferenced before check 'irqd' (see line 235)

Fixes: 7505576d1c1a ("MIPS: add support for SGI Octane (IP30)")
Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
 arch/mips/sgi-ip30/ip30-irq.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Paul Burton Jan. 23, 2020, 7:44 p.m. UTC | #1
Hello,

Thomas Bogendoerfer wrote:
> Fix issue detected by Smatch:
> 
>     ./arch/mips/sgi-ip30/ip30-irq.c:236 heart_domain_free()
>      warn: variable dereferenced before check 'irqd' (see line 235)

Applied to mips-next.

> commit c0e79fd89749
> https://git.kernel.org/mips/c/c0e79fd89749
> 
> Fixes: 7505576d1c1a ("MIPS: add support for SGI Octane (IP30)")
> Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
> Signed-off-by: Paul Burton <paulburton@kernel.org>

Thanks,
    Paul

[ This message was auto-generated; if you believe anything is incorrect
  then please email paulburton@kernel.org to report it. ]
diff mbox series

Patch

diff --git a/arch/mips/sgi-ip30/ip30-irq.c b/arch/mips/sgi-ip30/ip30-irq.c
index d45865c7644c..11cd2a888de5 100644
--- a/arch/mips/sgi-ip30/ip30-irq.c
+++ b/arch/mips/sgi-ip30/ip30-irq.c
@@ -245,9 +245,10 @@  static void heart_domain_free(struct irq_domain *domain,
 		return;
 
 	irqd = irq_domain_get_irq_data(domain, virq);
-	clear_bit(irqd->hwirq, heart_irq_map);
-	if (irqd && irqd->chip_data)
+	if (irqd) {
+		clear_bit(irqd->hwirq, heart_irq_map);
 		kfree(irqd->chip_data);
+	}
 }
 
 static const struct irq_domain_ops heart_domain_ops = {