| Message ID | 20220223084954.1771075-1-yangyingliang@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d434ee9dee6dc75984897f183df773427a68a1ff |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,1/2] net: marvell: prestera: Fix return value check in prestera_fib_node_find() | expand |
Hello: This series was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Wed, 23 Feb 2022 16:49:53 +0800 you wrote: > rhashtable_lookup_fast() returns NULL pointer not ERR_PTR(), so > it can return fib_node directly in prestera_fib_node_find(). > > Fixes: 16de3db1208a ("net: marvell: prestera: add hardware router objects accounting for lpm") > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> > > [...] Here is the summary with links: - [net-next,1/2] net: marvell: prestera: Fix return value check in prestera_fib_node_find() https://git.kernel.org/netdev/net-next/c/d434ee9dee6d - [net-next,2/2] net: marvell: prestera: Fix return value check in prestera_kern_fib_cache_find() https://git.kernel.org/netdev/net-next/c/37f40f81e589 You are awesome, thank you!
diff --git a/drivers/net/ethernet/marvell/prestera/prestera_router_hw.c b/drivers/net/ethernet/marvell/prestera/prestera_router_hw.c index d62adb970dd5..5b0cf3be9a9e 100644 --- a/drivers/net/ethernet/marvell/prestera/prestera_router_hw.c +++ b/drivers/net/ethernet/marvell/prestera/prestera_router_hw.c @@ -239,7 +239,7 @@ prestera_fib_node_find(struct prestera_switch *sw, struct prestera_fib_key *key) fib_node = rhashtable_lookup_fast(&sw->router->fib_ht, key, __prestera_fib_ht_params); - return IS_ERR(fib_node) ? NULL : fib_node; + return fib_node; } static void __prestera_fib_node_destruct(struct prestera_switch *sw,
rhashtable_lookup_fast() returns NULL pointer not ERR_PTR(), so it can return fib_node directly in prestera_fib_node_find(). Fixes: 16de3db1208a ("net: marvell: prestera: add hardware router objects accounting for lpm") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- drivers/net/ethernet/marvell/prestera/prestera_router_hw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)