* [PATCH] net: ethernet: ti: am65-cpsw: fix NULL deref check in am65_cpsw_nuss_probe
@ 2024-10-25 9:11 Charles Han
2024-10-26 12:43 ` Simon Horman
0 siblings, 1 reply; 2+ messages in thread
From: Charles Han @ 2024-10-25 9:11 UTC (permalink / raw)
To: rogerq, andrew+netdev, davem, edumazet, kuba, pabeni
Cc: jpanis, dan.carpenter, grygorii.strashko, u.kleine-koenig, netdev,
linux-kernel, Charles Han
In am65_cpsw_nuss_probe() devm_kzalloc() may return NULL but this
returned value is not checked.
Fixes: 1af3cb3702d0 ("net: ethernet: ti: am65-cpsw: Fix hardware switch mode on suspend/resume")
Signed-off-by: Charles Han <hanchunchao@inspur.com>
---
drivers/net/ethernet/ti/am65-cpsw-nuss.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
index 6201a09fa5f0..7af7542093e8 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
@@ -3528,6 +3528,9 @@ static int am65_cpsw_nuss_probe(struct platform_device *pdev)
common->ale_context = devm_kzalloc(dev,
ale_entries * ALE_ENTRY_WORDS * sizeof(u32),
GFP_KERNEL);
+ if (!common->ale_context)
+ return -ENOMEM;
+
ret = am65_cpsw_init_cpts(common);
if (ret)
goto err_of_clear;
--
2.31.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] net: ethernet: ti: am65-cpsw: fix NULL deref check in am65_cpsw_nuss_probe
2024-10-25 9:11 [PATCH] net: ethernet: ti: am65-cpsw: fix NULL deref check in am65_cpsw_nuss_probe Charles Han
@ 2024-10-26 12:43 ` Simon Horman
0 siblings, 0 replies; 2+ messages in thread
From: Simon Horman @ 2024-10-26 12:43 UTC (permalink / raw)
To: Charles Han
Cc: rogerq, andrew+netdev, davem, edumazet, kuba, pabeni, jpanis,
dan.carpenter, grygorii.strashko, u.kleine-koenig, netdev,
linux-kernel
On Fri, Oct 25, 2024 at 05:11:39PM +0800, Charles Han wrote:
> In am65_cpsw_nuss_probe() devm_kzalloc() may return NULL but this
> returned value is not checked.
>
> Fixes: 1af3cb3702d0 ("net: ethernet: ti: am65-cpsw: Fix hardware switch mode on suspend/resume")
> Signed-off-by: Charles Han <hanchunchao@inspur.com>
Hi Charles,
As this is a fix for Networking code it should be explicitly targeted
at the net tree like this:
Subject: [PATCH net v2] ...
> ---
> drivers/net/ethernet/ti/am65-cpsw-nuss.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
> index 6201a09fa5f0..7af7542093e8 100644
> --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
> +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
> @@ -3528,6 +3528,9 @@ static int am65_cpsw_nuss_probe(struct platform_device *pdev)
> common->ale_context = devm_kzalloc(dev,
> ale_entries * ALE_ENTRY_WORDS * sizeof(u32),
> GFP_KERNEL);
> + if (!common->ale_context)
> + return -ENOMEM;
> +
While I agree this error should be checked, I don't think this error
handling is correct and will lead to leaked resources. Looking
over this function I think you want (completely untested!):
if (!common->ale_context) {
ret = -ENOMEM;
goto err_of_clear;
}
> ret = am65_cpsw_init_cpts(common);
> if (ret)
> goto err_of_clear;
--
pw-bot: changes-requested
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-10-26 12:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-25 9:11 [PATCH] net: ethernet: ti: am65-cpsw: fix NULL deref check in am65_cpsw_nuss_probe Charles Han
2024-10-26 12:43 ` Simon Horman
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).