* [PATCH 1/2] slimbus: qcom-ctrl: fix a NULL test
@ 2018-01-09 9:26 Dan Carpenter
2018-01-09 9:26 ` [PATCH 2/2] slimbus: qcom-ctrl: Fix devm_ioremap_resource() error handling Dan Carpenter
2018-01-09 9:48 ` [PATCH 1/2] slimbus: qcom-ctrl: fix a NULL test Srinivas Kandagatla
0 siblings, 2 replies; 4+ messages in thread
From: Dan Carpenter @ 2018-01-09 9:26 UTC (permalink / raw)
To: Srinivas Kandagatla, Sagar Dharia
Cc: alsa-devel, linux-kernel, kernel-janitors, Greg Kroah-Hartman
"retries" ends when it is set to -1 and not 0 so that part of the test
is wrong. This bug would lead to a NULL dereference a couple lines
later.
Fixes: afbdcc7c384b ("slimbus: Add messaging APIs to slimbus framework")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
Should Greg be added to the MAINTAINERS file for this driver?
diff --git a/drivers/slimbus/qcom-ctrl.c b/drivers/slimbus/qcom-ctrl.c
index fb1a5e0eb8dd..3ab59209cbdc 100644
--- a/drivers/slimbus/qcom-ctrl.c
+++ b/drivers/slimbus/qcom-ctrl.c
@@ -345,7 +345,7 @@ static int qcom_xfer_msg(struct slim_controller *sctrl,
}
}
- if (!retries && !pbuf)
+ if (!pbuf)
return -ENOMEM;
puc = (u8 *)pbuf;
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] slimbus: qcom-ctrl: Fix devm_ioremap_resource() error handling
2018-01-09 9:26 [PATCH 1/2] slimbus: qcom-ctrl: fix a NULL test Dan Carpenter
@ 2018-01-09 9:26 ` Dan Carpenter
2018-01-09 9:48 ` Srinivas Kandagatla
2018-01-09 9:48 ` [PATCH 1/2] slimbus: qcom-ctrl: fix a NULL test Srinivas Kandagatla
1 sibling, 1 reply; 4+ messages in thread
From: Dan Carpenter @ 2018-01-09 9:26 UTC (permalink / raw)
To: Srinivas Kandagatla
Cc: alsa-devel, linux-kernel, kernel-janitors, Greg Kroah-Hartman
devm_ioremap_resource() returns error pointers, not NULL so the check
needs to be fixed.
Fixes: ad7fcbc308b0 ("slimbus: qcom: Add Qualcomm Slimbus controller driver")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/slimbus/qcom-ctrl.c b/drivers/slimbus/qcom-ctrl.c
index 3ab59209cbdc..6bf95bf33299 100644
--- a/drivers/slimbus/qcom-ctrl.c
+++ b/drivers/slimbus/qcom-ctrl.c
@@ -528,9 +528,9 @@ static int qcom_slim_probe(struct platform_device *pdev)
slim_mem = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ctrl");
ctrl->base = devm_ioremap_resource(ctrl->dev, slim_mem);
- if (!ctrl->base) {
+ if (IS_ERR(ctrl->base)) {
dev_err(&pdev->dev, "IOremap failed\n");
- return -ENOMEM;
+ return PTR_ERR(ctrl->base);
}
sctrl->set_laddr = qcom_set_laddr;
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] slimbus: qcom-ctrl: Fix devm_ioremap_resource() error handling
2018-01-09 9:26 ` [PATCH 2/2] slimbus: qcom-ctrl: Fix devm_ioremap_resource() error handling Dan Carpenter
@ 2018-01-09 9:48 ` Srinivas Kandagatla
0 siblings, 0 replies; 4+ messages in thread
From: Srinivas Kandagatla @ 2018-01-09 9:48 UTC (permalink / raw)
To: Dan Carpenter
Cc: alsa-devel, linux-kernel, kernel-janitors, Greg Kroah-Hartman
On 09/01/18 09:26, Dan Carpenter wrote:
> devm_ioremap_resource() returns error pointers, not NULL so the check
> needs to be fixed.
>
> Fixes: ad7fcbc308b0 ("slimbus: qcom: Add Qualcomm Slimbus controller driver")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/slimbus/qcom-ctrl.c b/drivers/slimbus/qcom-ctrl.c
> index 3ab59209cbdc..6bf95bf33299 100644
> --- a/drivers/slimbus/qcom-ctrl.c
> +++ b/drivers/slimbus/qcom-ctrl.c
> @@ -528,9 +528,9 @@ static int qcom_slim_probe(struct platform_device *pdev)
>
> slim_mem = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ctrl");
> ctrl->base = devm_ioremap_resource(ctrl->dev, slim_mem);
> - if (!ctrl->base) {
> + if (IS_ERR(ctrl->base)) {
> dev_err(&pdev->dev, "IOremap failed\n");
> - return -ENOMEM;
> + return PTR_ERR(ctrl->base);
> }
>
> sctrl->set_laddr = qcom_set_laddr;
>
Already fixed at:
https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg1575797.html
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] slimbus: qcom-ctrl: fix a NULL test
2018-01-09 9:26 [PATCH 1/2] slimbus: qcom-ctrl: fix a NULL test Dan Carpenter
2018-01-09 9:26 ` [PATCH 2/2] slimbus: qcom-ctrl: Fix devm_ioremap_resource() error handling Dan Carpenter
@ 2018-01-09 9:48 ` Srinivas Kandagatla
1 sibling, 0 replies; 4+ messages in thread
From: Srinivas Kandagatla @ 2018-01-09 9:48 UTC (permalink / raw)
To: Dan Carpenter, Sagar Dharia
Cc: alsa-devel, linux-kernel, kernel-janitors, Greg Kroah-Hartman
On 09/01/18 09:26, Dan Carpenter wrote:
> "retries" ends when it is set to -1 and not 0 so that part of the test
> is wrong. This bug would lead to a NULL dereference a couple lines
> later.
>
> Fixes: afbdcc7c384b ("slimbus: Add messaging APIs to slimbus framework")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> Should Greg be added to the MAINTAINERS file for this driver?
>
> diff --git a/drivers/slimbus/qcom-ctrl.c b/drivers/slimbus/qcom-ctrl.c
> index fb1a5e0eb8dd..3ab59209cbdc 100644
> --- a/drivers/slimbus/qcom-ctrl.c
> +++ b/drivers/slimbus/qcom-ctrl.c
> @@ -345,7 +345,7 @@ static int qcom_xfer_msg(struct slim_controller *sctrl,
> }
> }
>
> - if (!retries && !pbuf)
> + if (!pbuf)
> return -ENOMEM;
>
> puc = (u8 *)pbuf;
>
Already fixed at:
https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg1575799.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-01-09 9:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-09 9:26 [PATCH 1/2] slimbus: qcom-ctrl: fix a NULL test Dan Carpenter
2018-01-09 9:26 ` [PATCH 2/2] slimbus: qcom-ctrl: Fix devm_ioremap_resource() error handling Dan Carpenter
2018-01-09 9:48 ` Srinivas Kandagatla
2018-01-09 9:48 ` [PATCH 1/2] slimbus: qcom-ctrl: fix a NULL test Srinivas Kandagatla
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).