diff options
| author | Colin Ian King <colin.king@canonical.com> | 2018-02-22 18:08:53 +0000 |
|---|---|---|
| committer | James Hogan <jhogan@kernel.org> | 2018-02-23 09:44:46 +0000 |
| commit | 902f4d067a50ccf645a58dd5fb1d113b6e0f9b5b (patch) | |
| tree | dee44260796d1630ea714176be8173e56ce299db | |
| parent | 1b22b4b28fd5fbc51855219e3238b3ab81da8466 (diff) | |
| download | linux-902f4d067a50ccf645a58dd5fb1d113b6e0f9b5b.tar.bz2 | |
MIPS: OCTEON: irq: Check for null return on kzalloc allocation
The allocation of host_data is not null checked, leading to a null
pointer dereference if the allocation fails. Fix this by adding a null
check and return with -ENOMEM.
Fixes: 64b139f97c01 ("MIPS: OCTEON: irq: add CIB and other fixes")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: David Daney <david.daney@cavium.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: "Steven J. Hill" <Steven.Hill@cavium.com>
Cc: linux-mips@linux-mips.org
Cc: <stable@vger.kernel.org> # 4.0+
Patchwork: https://patchwork.linux-mips.org/patch/18658/
Signed-off-by: James Hogan <jhogan@kernel.org>
| -rw-r--r-- | arch/mips/cavium-octeon/octeon-irq.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/cavium-octeon/octeon-irq.c b/arch/mips/cavium-octeon/octeon-irq.c index 5b3a3f6a9ad3..d99f5242169e 100644 --- a/arch/mips/cavium-octeon/octeon-irq.c +++ b/arch/mips/cavium-octeon/octeon-irq.c @@ -2277,6 +2277,8 @@ static int __init octeon_irq_init_cib(struct device_node *ciu_node, } host_data = kzalloc(sizeof(*host_data), GFP_KERNEL); + if (!host_data) + return -ENOMEM; raw_spin_lock_init(&host_data->lock); addr = of_get_address(ciu_node, 0, NULL, NULL); |