* [PATCH] MIPS: OCTEON: irq: check for null return on kzalloc allocation
@ 2018-02-22 18:08 Colin King
2018-02-22 18:10 ` David Daney
0 siblings, 1 reply; 3+ messages in thread
From: Colin King @ 2018-02-22 18:08 UTC (permalink / raw)
To: Ralf Baechle, James Hogan, Steven J . Hill, David Daney,
linux-mips
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
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>
---
arch/mips/cavium-octeon/octeon-irq.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/mips/cavium-octeon/octeon-irq.c b/arch/mips/cavium-octeon/octeon-irq.c
index b993d9f2c9b9..203e1d2a56d5 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);
--
2.15.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] MIPS: OCTEON: irq: check for null return on kzalloc allocation
2018-02-22 18:08 [PATCH] MIPS: OCTEON: irq: check for null return on kzalloc allocation Colin King
@ 2018-02-22 18:10 ` David Daney
2018-02-23 9:53 ` James Hogan
0 siblings, 1 reply; 3+ messages in thread
From: David Daney @ 2018-02-22 18:10 UTC (permalink / raw)
To: Colin King, Ralf Baechle, James Hogan, Steven J . Hill,
David Daney, linux-mips
Cc: kernel-janitors, linux-kernel
On 02/22/2018 10:08 AM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> 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>
> ---
> arch/mips/cavium-octeon/octeon-irq.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/mips/cavium-octeon/octeon-irq.c b/arch/mips/cavium-octeon/octeon-irq.c
> index b993d9f2c9b9..203e1d2a56d5 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);
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] MIPS: OCTEON: irq: check for null return on kzalloc allocation
2018-02-22 18:10 ` David Daney
@ 2018-02-23 9:53 ` James Hogan
0 siblings, 0 replies; 3+ messages in thread
From: James Hogan @ 2018-02-23 9:53 UTC (permalink / raw)
To: David Daney
Cc: Colin King, Ralf Baechle, Steven J . Hill, David Daney,
linux-mips, kernel-janitors, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 613 bytes --]
On Thu, Feb 22, 2018 at 10:10:30AM -0800, David Daney wrote:
> On 02/22/2018 10:08 AM, Colin King wrote:
> > From: Colin Ian King <colin.king@canonical.com>
> >
> > 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>
Applied to my fixes branch with 4.0+ stable tag.
Thanks
James
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-02-23 9:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-22 18:08 [PATCH] MIPS: OCTEON: irq: check for null return on kzalloc allocation Colin King
2018-02-22 18:10 ` David Daney
2018-02-23 9:53 ` James Hogan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox