* [PATCH net] net: marvell: prestera: fix a couple NULL vs IS_ERR() checks
@ 2022-10-12 15:00 Dan Carpenter
2022-10-13 16:50 ` patchwork-bot+netdevbpf
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2022-10-12 15:00 UTC (permalink / raw)
To: Taras Chornyi, Yevhen Orlov
Cc: David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Oleksandr Mazur, netdev, kernel-janitors
The __prestera_nexthop_group_create() function returns NULL on error
and the prestera_nexthop_group_get() returns error pointers. Fix these
two checks.
Fixes: 0a23ae237171 ("net: marvell: prestera: Add router nexthops ABI")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/net/ethernet/marvell/prestera/prestera_router_hw.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/marvell/prestera/prestera_router_hw.c b/drivers/net/ethernet/marvell/prestera/prestera_router_hw.c
index 4f65df0ae5e8..aa080dc57ff0 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_router_hw.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_router_hw.c
@@ -498,8 +498,8 @@ prestera_nexthop_group_get(struct prestera_switch *sw,
refcount_inc(&nh_grp->refcount);
} else {
nh_grp = __prestera_nexthop_group_create(sw, key);
- if (IS_ERR(nh_grp))
- return ERR_CAST(nh_grp);
+ if (!nh_grp)
+ return ERR_PTR(-ENOMEM);
refcount_set(&nh_grp->refcount, 1);
}
@@ -651,7 +651,7 @@ prestera_fib_node_create(struct prestera_switch *sw,
case PRESTERA_FIB_TYPE_UC_NH:
fib_node->info.nh_grp = prestera_nexthop_group_get(sw,
nh_grp_key);
- if (!fib_node->info.nh_grp)
+ if (IS_ERR(fib_node->info.nh_grp))
goto err_nh_grp_get;
grp_id = fib_node->info.nh_grp->grp_id;
--
2.35.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH net] net: marvell: prestera: fix a couple NULL vs IS_ERR() checks
2022-10-12 15:00 [PATCH net] net: marvell: prestera: fix a couple NULL vs IS_ERR() checks Dan Carpenter
@ 2022-10-13 16:50 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 2+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-10-13 16:50 UTC (permalink / raw)
To: Dan Carpenter
Cc: tchornyi, yevhen.orlov, davem, edumazet, kuba, pabeni,
oleksandr.mazur, netdev, kernel-janitors
Hello:
This patch was applied to netdev/net.git (master)
by Jakub Kicinski <kuba@kernel.org>:
On Wed, 12 Oct 2022 18:00:59 +0300 you wrote:
> The __prestera_nexthop_group_create() function returns NULL on error
> and the prestera_nexthop_group_get() returns error pointers. Fix these
> two checks.
>
> Fixes: 0a23ae237171 ("net: marvell: prestera: Add router nexthops ABI")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> [...]
Here is the summary with links:
- [net] net: marvell: prestera: fix a couple NULL vs IS_ERR() checks
https://git.kernel.org/netdev/net/c/30e9672ac37f
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] 2+ messages in thread
end of thread, other threads:[~2022-10-13 16:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-12 15:00 [PATCH net] net: marvell: prestera: fix a couple NULL vs IS_ERR() checks Dan Carpenter
2022-10-13 16:50 ` 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).