Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1739036

[PATCH net v2 2/3] net: mvpp2: fix port list indexing

Show all headers | View raw

From: Yan Markman <ymarkman@marvell.com>

The private port_list array has a list of pointers to mvpp2_port
instances. This list is allocated given the number of ports enabled in
the device tree, but the pointers are set using the port-id property. If
on a single port is enabled, the port_list array will be of size 1, but
when registering the port, if its id is not 0 the driver will crash.
Other crashes were encountered in various situations.

This fixes the issue by using an index not equal to the value of the
port-id property.

Fixes: 3f518509dedc ("ethernet: Add new driver for Marvell Armada 375 network unit")
Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
---
 drivers/net/ethernet/marvell/mvpp2.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c
index da04939a2748..b2f99df81e9c 100644
--- a/drivers/net/ethernet/marvell/mvpp2.c
+++ b/drivers/net/ethernet/marvell/mvpp2.c
@@ -7504,7 +7504,7 @@ static void mvpp2_port_copy_mac_addr(struct net_device *dev, struct mvpp2 *priv,
 /* Ports initialization */
 static int mvpp2_port_probe(struct platform_device *pdev,
 			    struct device_node *port_node,
-			    struct mvpp2 *priv)
+			    struct mvpp2 *priv, int index)
 {
 	struct device_node *phy_node;
 	struct phy *comphy;
@@ -7678,7 +7678,7 @@ static int mvpp2_port_probe(struct platform_device *pdev,
 	}
 	netdev_info(dev, "Using %s mac address %pM\n", mac_from, dev->dev_addr);
 
-	priv->port_list[id] = port;
+	priv->port_list[index] = port;
 	return 0;
 
 err_free_port_pcpu:
@@ -8013,10 +8013,12 @@ static int mvpp2_probe(struct platform_device *pdev)
 	}
 
 	/* Initialize ports */
+	i = 0;
 	for_each_available_child_of_node(dn, port_node) {
-		err = mvpp2_port_probe(pdev, port_node, priv);
+		err = mvpp2_port_probe(pdev, port_node, priv, i);
 		if (err < 0)
 			goto err_mg_clk;
+		i++;
 	}
 
 	platform_set_drvdata(pdev, priv);
-- 
2.13.5

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH net v2 0/3] net: mvpp2: various fixes Antoine Tenart <antoine.tenart@free-electrons.com> - 2017-09-25 15:10 +0200
  [PATCH net v2 2/3] net: mvpp2: fix port list indexing Antoine Tenart <antoine.tenart@free-electrons.com> - 2017-09-25 15:10 +0200
    Re: [PATCH net v2 2/3] net: mvpp2: fix port list indexing Antoine Tenart <antoine.tenart@free-electrons.com> - 2017-09-25 15:10 +0200
  [PATCH net v2 1/3] net: mvpp2: fix parsing fragmentation detection Antoine Tenart <antoine.tenart@free-electrons.com> - 2017-09-25 15:10 +0200
    Re: [PATCH net v2 1/3] net: mvpp2: fix parsing fragmentation  detection Antoine Tenart <antoine.tenart@free-electrons.com> - 2017-09-25 15:20 +0200
  [PATCH net v2 3/3] net: mvpp2: do not select the internal source clock Antoine Tenart <antoine.tenart@free-electrons.com> - 2017-09-25 15:10 +0200

csiph-web