Skip to contentSkip to conversation

net: mvpp2: fix possible invalid pointer dereference

PATCH In review Hui Tang 2 participants 3 messages Nov 15, 2022

Subsystems (3)
lore
Share & tools
lore

Hui Tang

author
#0 lore raw

PATCH 1/1 net: mvpp2: fix possible invalid pointer dereference

It will cause invalid pointer dereference to priv->cm3_base behind, if PTR_ERR(priv->cm3_base) in mvpp2_get_sram().

Fixes a59d354208a7 ("net: mvpp2: enable global flow control")
---
 drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +1 -1
index d98f7e9a480e..c92bd1922421 100644
@@ -7421,7 +7421,7 @@ static int mvpp2_probe(struct platform_device *pdev)
 			dev_warn(&pdev->dev, "Fail to alloc CM3 SRAM\n");
 
 		/* Enable global Flow Control only if handler to SRAM not NULL */
-		if (priv->cm3_base)
+		if (!IS_ERR_OR_NULL(priv->cm3_base))
 			priv->global_tx_fc = true;
 	}
 
Signature · 1 line
2.17.1
#1 lore raw
Quoted 14 lines · Hui Tang

It will cause invalid pointer dereference to priv->cm3_base behind, if PTR_ERR(priv->cm3_base) in mvpp2_get_sram().

Fixes a59d354208a7 ("net: mvpp2: enable global flow control")
---
 drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +0 -0
index d98f7e9a480e..c92bd1922421 100644

drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c static int mvpp2_probe(struct platform_device *pdev) · line 7425

Quoted 6 lines
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +1 -1
@@ -7421,7 +7421,7 @@ static int mvpp2_probe(struct platform_device *pdev)
 			dev_warn(&pdev->dev, "Fail to alloc CM3 SRAM\n");
 
 		/* Enable global Flow Control only if handler to SRAM not NULL */
-		if (priv->cm3_base)
+		if (!IS_ERR_OR_NULL(priv->cm3_base))
 			priv->global_tx_fc = true;

The change is ok, but the patch title should include target, in your case it is net -> [PATCH net] ....

Thanks

Quoted 5 lines
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +0 -0
 	}
 
Signature · 1 line
2.17.1
author
#2 lore raw
Quoted 17 lines · Leon Romanovsky
Quoted 16 lines · Hui Tang

It will cause invalid pointer dereference to priv->cm3_base behind, if PTR_ERR(priv->cm3_base) in mvpp2_get_sram().

Fixes a59d354208a7 ("net: mvpp2: enable global flow control")
---
 drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +0 -0
index d98f7e9a480e..c92bd1922421 100644
@@ -7421,7 +7421,7 @@ static int mvpp2_probe(struct platform_device *pdev)
 			dev_warn(&pdev->dev, "Fail to alloc CM3 SRAM\n");
 
Quoted 7 lines

drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c static int mvpp2_probe(struct platform_device *pdev) · line 7425

Quoted 4 lines
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +1 -1
 		/* Enable global Flow Control only if handler to SRAM not NULL */
-		if (priv->cm3_base)
+		if (!IS_ERR_OR_NULL(priv->cm3_base))
 			priv->global_tx_fc = true;

The change is ok, but the patch title should include target, in your case it is net -> [PATCH net] ....

Thanks, I will fix it in v2.