]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
MIPS: OCTEON: irq: Fix potential NULL pointer dereference
authorGustavo A. R. Silva <gustavo@embeddedor.com>
Tue, 22 Jan 2019 20:18:42 +0000 (14:18 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 17 Apr 2020 08:48:47 +0000 (10:48 +0200)
commit 792a402c2840054533ef56279c212ef6da87d811 upstream.

There is a potential NULL pointer dereference in case kzalloc()
fails and returns NULL.

Fix this by adding a NULL check on *cd*

This bug was detected with the help of Coccinelle.

Fixes: 64b139f97c01 ("MIPS: OCTEON: irq: add CIB and other fixes")
Cc: stable@vger.kernel.org
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/mips/cavium-octeon/octeon-irq.c

index 8272d8c648ca9fd4f218093212c89ad5245f4eb8..43e4fc1b373ca37809698f29a1ce0f61615f623d 100644 (file)
@@ -2199,6 +2199,9 @@ static int octeon_irq_cib_map(struct irq_domain *d,
        }
 
        cd = kzalloc(sizeof(*cd), GFP_KERNEL);
+       if (!cd)
+               return -ENOMEM;
+
        cd->host_data = host_data;
        cd->bit = hw;