Commit 6115c11f authored Nov 13, 2013 by Dan Carpenter Committed by David S. Miller Nov 14, 2013

net: mv643xx_eth: potential NULL dereference in probe()



We assume that "mp->phy" can be NULL a couple lines before the
dereference.

Fixes: 1cce16d3 ('net: mv643xx_eth: Add missing phy_addr_set in DT mode')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 64b8c8e5

drivers/net/ethernet/marvell/mv643xx_eth.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2890,6 +2890,7 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
		PHY_INTERFACE_MODE_GMII);
		if (!mp->phy)
		err = -ENODEV;
		else
		phy_addr_set(mp, mp->phy->addr);
		} else if (pd->phy_addr != MV643XX_ETH_PHY_NONE) {
		mp->phy = phy_scan(mp, pd->phy_addr);