net: ethernet: mediatek: get out of potential invalid pointer access
authorSean Wang <sean.wang@mediatek.com>
Thu, 22 Sep 2016 08:44:16 +0000 (16:44 +0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 22 Sep 2016 12:22:28 +0000 (08:22 -0400)
Potential dangerous invalid pointer might be accessed if
the error happens when couple phy_device to net_device so
cleanup the error path.

Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mediatek/mtk_eth_soc.c

index a65801a5e2eede284bf631958638a2c11af01236..3d7e0cb601b658e13f16af717b5d30101321cf4f 100644 (file)
@@ -296,7 +296,9 @@ static int mtk_phy_connect(struct net_device *dev)
        regmap_write(eth->ethsys, ETHSYS_SYSCFG0, val);
 
        /* couple phydev to net_device */
-       mtk_phy_connect_node(eth, mac, np);
+       if (mtk_phy_connect_node(eth, mac, np))
+               goto err_phy;
+
        dev->phydev->autoneg = AUTONEG_ENABLE;
        dev->phydev->speed = 0;
        dev->phydev->duplex = 0;
@@ -317,7 +319,7 @@ static int mtk_phy_connect(struct net_device *dev)
 
 err_phy:
        of_node_put(np);
-       dev_err(eth->dev, "invalid phy_mode\n");
+       dev_err(eth->dev, "%s: invalid phy\n", __func__);
        return -EINVAL;
 }