Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9afec6ef authored by Andy Shevchenko's avatar Andy Shevchenko Committed by David S. Miller
Browse files

stmmac: prevent probe drivers to crash kernel 



In the case when alloc_netdev fails we return NULL to a caller. But there is no
check for NULL in the probe drivers. This patch changes NULL to an error
pointer. The function description is amended to reflect what we may get
returned.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 24e579c8

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+4 −1
Original line number Diff line number Diff line
@@ -2778,6 +2778,9 @@ static int stmmac_hw_init(struct stmmac_priv *priv) 
 * @addr: iobase memory address

 * Description: this is the main probe function used to

 * call the alloc_etherdev, allocate the priv structure.

 * Return:

 * on success the new private structure is returned, otherwise the error

 * pointer.

 */

struct stmmac_priv *stmmac_dvr_probe(struct device *device,

				     struct plat_stmmacenet_data *plat_dat,
@@ -2789,7 +2792,7 @@ struct stmmac_priv *stmmac_dvr_probe(struct device *device, 


	ndev = alloc_etherdev(sizeof(struct stmmac_priv));

	if (!ndev)

		return NULL;

		return ERR_PTR(-ENOMEM);



	SET_NETDEV_DEV(ndev, device);