diff options
| author | Gustavo A. R. Silva <gustavo@embeddedor.com> | 2018-07-26 02:47:19 +0200 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2018-08-31 19:37:00 +0200 |
| commit | e9a2310fb689151166df7fd9971093362d34bd79 (patch) | |
| tree | 49ff5f885fc06ad2767f81985ba2be0d4acc765f /drivers/clk/hisilicon | |
| parent | clk: cdce925: release child device nodes (diff) | |
| download | linux-e9a2310fb689151166df7fd9971093362d34bd79.tar.xz linux-e9a2310fb689151166df7fd9971093362d34bd79.zip | |
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.
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>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Diffstat (limited to 'drivers/clk/hisilicon')
| -rw-r--r-- | drivers/clk/hisilicon/reset.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/clk/hisilicon/reset.c b/drivers/clk/hisilicon/reset.c index 2a5015c736ce..43e82fa64422 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); |