| From 902f4d067a50ccf645a58dd5fb1d113b6e0f9b5b Mon Sep 17 00:00:00 2001 |
| From: Colin Ian King <colin.king@canonical.com> |
| Date: Thu, 22 Feb 2018 18:08:53 +0000 |
| Subject: MIPS: OCTEON: irq: Check for null return on kzalloc allocation |
| |
| From: Colin Ian King <colin.king@canonical.com> |
| |
| commit 902f4d067a50ccf645a58dd5fb1d113b6e0f9b5b upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/mips/cavium-octeon/octeon-irq.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- 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(st |
| } |
| |
| 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); |