net: ethernet: mvneta: Fix error handling in mvneta_probe

dinghaoliu · kuba-moo · commit 58f60329a6be · 2020-12-22T18:49:45.000-08:00
When mvneta_port_power_up() fails, we should execute cleanup functions after label err_netdev to avoid memleak. Fixes: 41c2b6b ("net: ethernet: mvneta: Add back interface mode validation") Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn> Link: https://lore.kernel.org/r/20201220082930.21623-1-dinghao.liu@zju.edu.cn Signed-off-by: Jakub Kicinski <kuba@kernel.org>
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
@@ -5255,7 +5255,7 @@ static int mvneta_probe(struct platform_device *pdev)
 	err = mvneta_port_power_up(pp, pp->phy_interface);
 	if (err < 0) {
 		dev_err(&pdev->dev, "can't power up port\n");
-		return err;
+		goto err_netdev;
 	}
 
 	/* Armada3700 network controller does not support per-cpu

Original file line number	Diff line number	Diff line change
`@@ -5255,7 +5255,7 @@ static int mvneta_probe(struct platform_device *pdev)`
`5255`	`5255`	`err = mvneta_port_power_up(pp, pp->phy_interface);`
`5256`	`5256`	`if (err < 0) {`
`5257`	`5257`	`dev_err(&pdev->dev, "can't power up port\n");`
`5258`		`- return err;`
	`5258`	`+ goto err_netdev;`
`5259`	`5259`	`}`
`5260`	`5260`
`5261`	`5261`	`/* Armada3700 network controller does not support per-cpu`