* [PATCH net-next 0/3] fix some bugs for sparx5
@ 2021-06-26 4:44 Yang Yingliang
2021-06-26 4:44 ` [PATCH net-next 1/3] net: sparx5: check return value after calling platform_get_resource() Yang Yingliang
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Yang Yingliang @ 2021-06-26 4:44 UTC (permalink / raw)
To: linux-kernel, netdev; +Cc: davem, kuba, lars.povlsen, Steen.Hegelund
Yang Yingliang (3):
net: sparx5: check return value after calling platform_get_resource()
net: sparx5: fix return value check in sparx5_create_targets()
net: sparx5: fix error return code in
sparx5_register_notifier_blocks()
drivers/net/ethernet/microchip/sparx5/sparx5_main.c | 8 ++++++--
drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c | 4 +++-
2 files changed, 9 insertions(+), 3 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH net-next 1/3] net: sparx5: check return value after calling platform_get_resource()
2021-06-26 4:44 [PATCH net-next 0/3] fix some bugs for sparx5 Yang Yingliang
@ 2021-06-26 4:44 ` Yang Yingliang
2021-06-26 4:44 ` [PATCH net-next 2/3] net: sparx5: fix return value check in sparx5_create_targets() Yang Yingliang
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Yang Yingliang @ 2021-06-26 4:44 UTC (permalink / raw)
To: linux-kernel, netdev; +Cc: davem, kuba, lars.povlsen, Steen.Hegelund
It will cause null-ptr-deref if platform_get_resource() returns NULL,
we need check the return value.
Fixes: 3cfa11bac9bb ("net: sparx5: add the basic sparx5 driver")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
drivers/net/ethernet/microchip/sparx5/sparx5_main.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_main.c b/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
index a325f7c05a07..665e20ccb404 100644
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
@@ -228,6 +228,10 @@ static int sparx5_create_targets(struct sparx5 *sparx5)
for (idx = 0; idx < IO_RANGES; idx++) {
iores[idx] = platform_get_resource(sparx5->pdev, IORESOURCE_MEM,
idx);
+ if (!iores[idx]) {
+ dev_err(sparx5->dev, "Invalid resource\n");
+ return -EINVAL;
+ }
iomem[idx] = devm_ioremap(sparx5->dev,
iores[idx]->start,
iores[idx]->end - iores[idx]->start
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH net-next 2/3] net: sparx5: fix return value check in sparx5_create_targets()
2021-06-26 4:44 [PATCH net-next 0/3] fix some bugs for sparx5 Yang Yingliang
2021-06-26 4:44 ` [PATCH net-next 1/3] net: sparx5: check return value after calling platform_get_resource() Yang Yingliang
@ 2021-06-26 4:44 ` Yang Yingliang
2021-06-26 4:44 ` [PATCH net-next 3/3] net: sparx5: fix error return code in sparx5_register_notifier_blocks() Yang Yingliang
2021-06-28 21:30 ` [PATCH net-next 0/3] fix some bugs for sparx5 patchwork-bot+netdevbpf
3 siblings, 0 replies; 5+ messages in thread
From: Yang Yingliang @ 2021-06-26 4:44 UTC (permalink / raw)
To: linux-kernel, netdev; +Cc: davem, kuba, lars.povlsen, Steen.Hegelund
In case of error, the function devm_ioremap() returns NULL pointer
not ERR_PTR(). The IS_ERR() test in the return value check should
be replaced with NULL test.
Fixes: 3cfa11bac9bb ("net: sparx5: add the basic sparx5 driver")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
drivers/net/ethernet/microchip/sparx5/sparx5_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_main.c b/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
index 665e20ccb404..abaa086ce345 100644
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
@@ -236,10 +236,10 @@ static int sparx5_create_targets(struct sparx5 *sparx5)
iores[idx]->start,
iores[idx]->end - iores[idx]->start
+ 1);
- if (IS_ERR(iomem[idx])) {
+ if (!iomem[idx]) {
dev_err(sparx5->dev, "Unable to get switch registers: %s\n",
iores[idx]->name);
- return PTR_ERR(iomem[idx]);
+ return -ENOMEM;
}
begin[idx] = iomem[idx] - sparx5_main_iomap[range_id[idx]].offset;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH net-next 3/3] net: sparx5: fix error return code in sparx5_register_notifier_blocks()
2021-06-26 4:44 [PATCH net-next 0/3] fix some bugs for sparx5 Yang Yingliang
2021-06-26 4:44 ` [PATCH net-next 1/3] net: sparx5: check return value after calling platform_get_resource() Yang Yingliang
2021-06-26 4:44 ` [PATCH net-next 2/3] net: sparx5: fix return value check in sparx5_create_targets() Yang Yingliang
@ 2021-06-26 4:44 ` Yang Yingliang
2021-06-28 21:30 ` [PATCH net-next 0/3] fix some bugs for sparx5 patchwork-bot+netdevbpf
3 siblings, 0 replies; 5+ messages in thread
From: Yang Yingliang @ 2021-06-26 4:44 UTC (permalink / raw)
To: linux-kernel, netdev; +Cc: davem, kuba, lars.povlsen, Steen.Hegelund
Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.
Fixes: d6fce5141929 ("net: sparx5: add switching support")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c b/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c
index 19c7cb795b4b..459f88c0a88b 100644
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c
@@ -485,8 +485,10 @@ int sparx5_register_notifier_blocks(struct sparx5 *s5)
goto err_switchdev_blocking_nb;
sparx5_owq = alloc_ordered_workqueue("sparx5_order", 0);
- if (!sparx5_owq)
+ if (!sparx5_owq) {
+ err = -ENOMEM;
goto err_switchdev_blocking_nb;
+ }
return 0;
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH net-next 0/3] fix some bugs for sparx5
2021-06-26 4:44 [PATCH net-next 0/3] fix some bugs for sparx5 Yang Yingliang
` (2 preceding siblings ...)
2021-06-26 4:44 ` [PATCH net-next 3/3] net: sparx5: fix error return code in sparx5_register_notifier_blocks() Yang Yingliang
@ 2021-06-28 21:30 ` patchwork-bot+netdevbpf
3 siblings, 0 replies; 5+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-06-28 21:30 UTC (permalink / raw)
To: Yang Yingliang
Cc: linux-kernel, netdev, davem, kuba, lars.povlsen, Steen.Hegelund
Hello:
This series was applied to netdev/net-next.git (refs/heads/master):
On Sat, 26 Jun 2021 12:44:17 +0800 you wrote:
> Yang Yingliang (3):
> net: sparx5: check return value after calling platform_get_resource()
> net: sparx5: fix return value check in sparx5_create_targets()
> net: sparx5: fix error return code in
> sparx5_register_notifier_blocks()
>
> drivers/net/ethernet/microchip/sparx5/sparx5_main.c | 8 ++++++--
> drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c | 4 +++-
> 2 files changed, 9 insertions(+), 3 deletions(-)
Here is the summary with links:
- [net-next,1/3] net: sparx5: check return value after calling platform_get_resource()
https://git.kernel.org/netdev/net-next/c/f00af5cc58ec
- [net-next,2/3] net: sparx5: fix return value check in sparx5_create_targets()
https://git.kernel.org/netdev/net-next/c/8f4c38f75886
- [net-next,3/3] net: sparx5: fix error return code in sparx5_register_notifier_blocks()
https://git.kernel.org/netdev/net-next/c/83300c69e797
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] 5+ messages in thread
end of thread, other threads:[~2021-06-28 21:30 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-26 4:44 [PATCH net-next 0/3] fix some bugs for sparx5 Yang Yingliang
2021-06-26 4:44 ` [PATCH net-next 1/3] net: sparx5: check return value after calling platform_get_resource() Yang Yingliang
2021-06-26 4:44 ` [PATCH net-next 2/3] net: sparx5: fix return value check in sparx5_create_targets() Yang Yingliang
2021-06-26 4:44 ` [PATCH net-next 3/3] net: sparx5: fix error return code in sparx5_register_notifier_blocks() Yang Yingliang
2021-06-28 21:30 ` [PATCH net-next 0/3] fix some bugs for sparx5 patchwork-bot+netdevbpf
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).