2024-05-16 09:44:01

by Chen Ni

Subject: [PATCH net-next] net: ethernet: mtk_eth_soc: add missing check for rhashtable_init

Add check for the return value of rhashtable_init() and return the error
if it fails in order to catch the error.

Fixes: 33fc42de3327 ("net: ethernet: mtk_eth_soc: support creating mac address based offload entries")
Signed-off-by: Chen Ni <[email protected]>
---
drivers/net/ethernet/mediatek/mtk_ppe.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/mediatek/mtk_ppe.c b/drivers/net/ethernet/mediatek/mtk_ppe.c
index 0acee405a749..f7e5e6e52cdf 100644
--- a/drivers/net/ethernet/mediatek/mtk_ppe.c
+++ b/drivers/net/ethernet/mediatek/mtk_ppe.c
@@ -884,12 +884,15 @@ struct mtk_ppe *mtk_ppe_init(struct mtk_eth *eth, void __iomem *base, int index)
struct mtk_ppe *ppe;
u32 foe_flow_size;
void *foe;
+ int ret;

ppe = devm_kzalloc(dev, sizeof(*ppe), GFP_KERNEL);
if (!ppe)
return NULL;

- rhashtable_init(&ppe->l2_flows, &mtk_flow_l2_ht_params);
+ ret = rhashtable_init(&ppe->l2_flows, &mtk_flow_l2_ht_params);
+ if (ret)
+ return NULL;

/* need to allocate a separate device, since it PPE DMA access is
* not coherent.
--
2.25.1

2024-05-16 09:57:37

by Hariprasad Kelam

Subject: ] [PATCH net-next] net: ethernet: mtk_eth_soc: add missing check for rhashtable_init

> Add check for the return value of rhashtable_init() and return the error if it
> fails in order to catch the error.
>
> Fixes: 33fc42de3327 ("net: ethernet: mtk_eth_soc: support creating mac
> address based offload entries")
> Signed-off-by: Chen Ni <[email protected]>
> ---
> drivers/net/ethernet/mediatek/mtk_ppe.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/mediatek/mtk_ppe.c
> b/drivers/net/ethernet/mediatek/mtk_ppe.c
> index 0acee405a749..f7e5e6e52cdf 100644
> --- a/drivers/net/ethernet/mediatek/mtk_ppe.c
> +++ b/drivers/net/ethernet/mediatek/mtk_ppe.c
> @@ -884,12 +884,15 @@ struct mtk_ppe *mtk_ppe_init(struct mtk_eth *eth,
> void __iomem *base, int index)
> struct mtk_ppe *ppe;
> u32 foe_flow_size;
> void *foe;
> + int ret;
>
> ppe = devm_kzalloc(dev, sizeof(*ppe), GFP_KERNEL);
> if (!ppe)
> return NULL;
>
> - rhashtable_init(&ppe->l2_flows, &mtk_flow_l2_ht_params);
> + ret = rhashtable_init(&ppe->l2_flows, &mtk_flow_l2_ht_params);
> + if (ret)
> + return NULL;

Instead of returning NULL, return actual error ERR_PTR(ret) and use IS_ERR_OR_NULL API to validate the error

Thanks,
Hariprasad k
>
> /* need to allocate a separate device, since it PPE DMA access is
> * not coherent.
> --
> 2.25.1
>