* [PATCH] remoteproc: qcom: Fix potential NULL dereference in adsp_init_mmio()
@ 2020-12-08 1:54 Zhang Changzhong
2020-12-10 22:30 ` patchwork-bot+linux-remoteproc
2020-12-29 20:15 ` patchwork-bot+linux-arm-msm
0 siblings, 2 replies; 3+ messages in thread
From: Zhang Changzhong @ 2020-12-08 1:54 UTC (permalink / raw
To: Andy Gross, Bjorn Andersson, Ohad Ben-Cohen, Sibi Sankar,
Rohit kumar
Cc: Zhang Changzhong, linux-arm-msm, linux-remoteproc, linux-kernel
platform_get_resource() may fail and in this case a NULL dereference
will occur.
Fix it to use devm_platform_ioremap_resource() instead of calling
platform_get_resource() and devm_ioremap().
This is detected by Coccinelle semantic patch.
@@
expression pdev, res, n, t, e, e1, e2;
@@
res = \(platform_get_resource\|platform_get_resource_byname\)(pdev, t,
n);
+ if (!res)
+ return -EINVAL;
... when != res == NULL
e = devm_ioremap(e1, res->start, e2);
Fixes: dc160e449122 ("remoteproc: qcom: Introduce Non-PAS ADSP PIL driver")
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
---
drivers/remoteproc/qcom_q6v5_adsp.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/remoteproc/qcom_q6v5_adsp.c b/drivers/remoteproc/qcom_q6v5_adsp.c
index efb2c1a..8674b73 100644
--- a/drivers/remoteproc/qcom_q6v5_adsp.c
+++ b/drivers/remoteproc/qcom_q6v5_adsp.c
@@ -362,15 +362,12 @@ static int adsp_init_mmio(struct qcom_adsp *adsp,
struct platform_device *pdev)
{
struct device_node *syscon;
- struct resource *res;
int ret;
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- adsp->qdsp6ss_base = devm_ioremap(&pdev->dev, res->start,
- resource_size(res));
- if (!adsp->qdsp6ss_base) {
+ adsp->qdsp6ss_base = devm_platform_ioremap_resource(pdev, 0);
+ if (IS_ERR(adsp->qdsp6ss_base)) {
dev_err(adsp->dev, "failed to map QDSP6SS registers\n");
- return -ENOMEM;
+ return PTR_ERR(adsp->qdsp6ss_base);
}
syscon = of_parse_phandle(pdev->dev.of_node, "qcom,halt-regs", 0);
--
2.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] remoteproc: qcom: Fix potential NULL dereference in adsp_init_mmio()
2020-12-08 1:54 [PATCH] remoteproc: qcom: Fix potential NULL dereference in adsp_init_mmio() Zhang Changzhong
@ 2020-12-10 22:30 ` patchwork-bot+linux-remoteproc
2020-12-29 20:15 ` patchwork-bot+linux-arm-msm
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+linux-remoteproc @ 2020-12-10 22:30 UTC (permalink / raw
To: Zhang Changzhong; +Cc: linux-remoteproc
Hello:
This patch was applied to andersson/remoteproc.git (refs/heads/for-next):
On Tue, 8 Dec 2020 09:54:20 +0800 you wrote:
> platform_get_resource() may fail and in this case a NULL dereference
> will occur.
>
> Fix it to use devm_platform_ioremap_resource() instead of calling
> platform_get_resource() and devm_ioremap().
>
> This is detected by Coccinelle semantic patch.
>
> [...]
Here is the summary with links:
- remoteproc: qcom: Fix potential NULL dereference in adsp_init_mmio()
https://git.kernel.org/andersson/remoteproc/c/c3d4e5b12672
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] remoteproc: qcom: Fix potential NULL dereference in adsp_init_mmio()
2020-12-08 1:54 [PATCH] remoteproc: qcom: Fix potential NULL dereference in adsp_init_mmio() Zhang Changzhong
2020-12-10 22:30 ` patchwork-bot+linux-remoteproc
@ 2020-12-29 20:15 ` patchwork-bot+linux-arm-msm
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+linux-arm-msm @ 2020-12-29 20:15 UTC (permalink / raw
To: Zhang Changzhong; +Cc: linux-arm-msm
Hello:
This patch was applied to qcom/linux.git (refs/heads/for-next):
On Tue, 8 Dec 2020 09:54:20 +0800 you wrote:
> platform_get_resource() may fail and in this case a NULL dereference
> will occur.
>
> Fix it to use devm_platform_ioremap_resource() instead of calling
> platform_get_resource() and devm_ioremap().
>
> This is detected by Coccinelle semantic patch.
>
> [...]
Here is the summary with links:
- remoteproc: qcom: Fix potential NULL dereference in adsp_init_mmio()
https://git.kernel.org/qcom/c/c3d4e5b12672
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-12-29 20:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-08 1:54 [PATCH] remoteproc: qcom: Fix potential NULL dereference in adsp_init_mmio() Zhang Changzhong
2020-12-10 22:30 ` patchwork-bot+linux-remoteproc
2020-12-29 20:15 ` patchwork-bot+linux-arm-msm
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.