* [PATCH v2] reset: hisilicon: fix potential NULL pointer dereference
@ 2018-07-26 0:47 Gustavo A. R. Silva
2018-08-31 17:36 ` Stephen Boyd
0 siblings, 1 reply; 3+ messages in thread
From: Gustavo A. R. Silva @ 2018-07-26 0:47 UTC (permalink / raw)
To: Michael Turquette, Stephen Boyd, Jiancheng Xue
Cc: linux-clk, linux-kernel, Gustavo A. R. Silva
There is a potential execution path in which function
platform_get_resource() returns NULL. If this happens,
we will end up having a NULL pointer dereference.
Fix this by replacing devm_ioremap with devm_ioremap_resource,
which has the NULL check and the memory region request.
This code was detected with the help of Coccinelle.
Cc: stable@vger.kernel.org
Fixes: 97b7129cd2af ("reset: hisilicon: change the definition of hisi_reset_init")
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
---
Changes in v2:
- Use devm_ioremap_resource. Thanks to Stephen Boyd for
pointing it out.
drivers/clk/hisilicon/reset.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/clk/hisilicon/reset.c b/drivers/clk/hisilicon/reset.c
index 2a5015c..43e82fa 100644
--- a/drivers/clk/hisilicon/reset.c
+++ b/drivers/clk/hisilicon/reset.c
@@ -109,9 +109,8 @@ struct hisi_reset_controller *hisi_reset_init(struct platform_device *pdev)
return NULL;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- rstc->membase = devm_ioremap(&pdev->dev,
- res->start, resource_size(res));
- if (!rstc->membase)
+ rstc->membase = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(rstc->membase))
return NULL;
spin_lock_init(&rstc->lock);
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] reset: hisilicon: fix potential NULL pointer dereference
2018-07-26 0:47 [PATCH v2] reset: hisilicon: fix potential NULL pointer dereference Gustavo A. R. Silva
@ 2018-08-31 17:36 ` Stephen Boyd
2018-08-31 18:06 ` Gustavo A. R. Silva
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Boyd @ 2018-08-31 17:36 UTC (permalink / raw)
To: Gustavo A. R. Silva, Jiancheng Xue, Michael Turquette
Cc: linux-clk, linux-kernel, Gustavo A. R. Silva
Quoting Gustavo A. R. Silva (2018-07-25 17:47:19)
> There is a potential execution path in which function
> platform_get_resource() returns NULL. If this happens,
> we will end up having a NULL pointer dereference.
>
> Fix this by replacing devm_ioremap with devm_ioremap_resource,
> which has the NULL check and the memory region request.
>
> This code was detected with the help of Coccinelle.
>
> Cc: stable@vger.kernel.org
> Fixes: 97b7129cd2af ("reset: hisilicon: change the definition of hisi_reset_init")
> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
> ---
Nobody has reviewed, so I guess applied to clk-next unless someone
complains.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] reset: hisilicon: fix potential NULL pointer dereference
2018-08-31 17:36 ` Stephen Boyd
@ 2018-08-31 18:06 ` Gustavo A. R. Silva
0 siblings, 0 replies; 3+ messages in thread
From: Gustavo A. R. Silva @ 2018-08-31 18:06 UTC (permalink / raw)
To: Stephen Boyd, Jiancheng Xue, Michael Turquette; +Cc: linux-clk, linux-kernel
On 8/31/18 12:36 PM, Stephen Boyd wrote:
>
> Nobody has reviewed, so I guess applied to clk-next unless someone
> complains.
>
Thanks, Stephen.
--
Gustavo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-08-31 18:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-26 0:47 [PATCH v2] reset: hisilicon: fix potential NULL pointer dereference Gustavo A. R. Silva
2018-08-31 17:36 ` Stephen Boyd
2018-08-31 18:06 ` Gustavo A. R. Silva
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).