reset: hisilicon: fix potential NULL pointer dereference
PATCH v2 1/1 reset: hisilicon: fix potential NULL pointer dereference
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.
---
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(-)
drivers/clk/hisilicon/reset.c +2 -3
@@ -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);
Signature · 1 line
2.7.4
Stephen Boyd
maintainerQuoting Gustavo A. R. Silva (2018-07-25 17:47:19)
Quoted 9 lines
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_ioremapwithdevm_ioremap_resource, which has the NULL check and the memory region request. =
Quoted 5 lines
This code was detected with the help of Coccinelle. =
Fixes 97b7129cd2af ("reset: hisilicon: change the definition of hisi_res=
et_init")
Quoted 2 lines
Signed-off-by Gustavo A. R. Silva <[email protected]>---
Nobody has reviewed, so I guess applied to clk-next unless someone complains.
Quoted 4 lines · Stephen Boyd
Nobody has reviewed, so I guess applied to clk-next unless someone complains.
Thanks, Stephen.
--
Gustavo