| Message ID | 20240517023922.362327-1-nichen@iscas.ac.cn (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [net-next,v2] net: ethernet: mtk_eth_soc: add missing check for rhashtable_init | expand |
On Fri, 17 May 2024 10:39:22 +0800 Chen Ni wrote: > diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c > index cae46290a7ae..f9b8956a8726 100644 > --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c > +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c > @@ -4957,7 +4957,7 @@ static int mtk_probe(struct platform_device *pdev) > > eth->ppe[i] = mtk_ppe_init(eth, eth->base + ppe_addr, i); > > - if (!eth->ppe[i]) { > + if (IS_ERR_OR_NULL(eth->ppe[i])) { > err = -ENOMEM; You still discard the real error here. > goto err_deinit_ppe; > } > diff --git a/drivers/net/ethernet/mediatek/mtk_ppe.c b/drivers/net/ethernet/mediatek/mtk_ppe.c > index 0acee405a749..4895c6febaf8 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; Please convert the return NULL in this function to return ERR_PTR(-ENOMEM) and use the error code in mtk_probe() > - rhashtable_init(&ppe->l2_flows, &mtk_flow_l2_ht_params); > + ret = rhashtable_init(&ppe->l2_flows, &mtk_flow_l2_ht_params); > + if (ret) > + return ERR_PTR(ret); Also there are two direct return NULLs without calling rhashtable_destroy() later in this function. Please fix that in a separate patch. > /* need to allocate a separate device, since it PPE DMA access is > * not coherent.
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c index cae46290a7ae..f9b8956a8726 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -4957,7 +4957,7 @@ static int mtk_probe(struct platform_device *pdev) eth->ppe[i] = mtk_ppe_init(eth, eth->base + ppe_addr, i); - if (!eth->ppe[i]) { + if (IS_ERR_OR_NULL(eth->ppe[i])) { err = -ENOMEM; goto err_deinit_ppe; } diff --git a/drivers/net/ethernet/mediatek/mtk_ppe.c b/drivers/net/ethernet/mediatek/mtk_ppe.c index 0acee405a749..4895c6febaf8 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 ERR_PTR(ret); /* need to allocate a separate device, since it PPE DMA access is * not coherent.
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 <nichen@iscas.ac.cn> --- Changelog: v1 -> v2: 1. Rewrite the error handling. --- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +- drivers/net/ethernet/mediatek/mtk_ppe.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-)