diff options
author | Rasmus Villemoes <linux@rasmusvillemoes.dk> | 2015-11-09 07:19:10 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-11-09 11:31:13 -0500 |
commit | cfb76d77c009b38e607c8a2adc8bdd57b5081768 (patch) | |
tree | fac0cdc7ed28a437668efb79caef5161ff5535d7 /drivers/net/caif | |
parent | 3870502a66fe26c80c034db1aa915d69850854aa (diff) |
net: caif: check return value of alloc_netdev
I don't know if dev can actually be NULL here, but the test should be
above alloc_netdev(), to avoid leaking the struct net_device in case
dev is actually NULL. And of course the return value from alloc_netdev
should be tested.
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/caif')
-rw-r--r-- | drivers/net/caif/caif_spi.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/caif/caif_spi.c b/drivers/net/caif/caif_spi.c index de3962014af7..4721948a92f6 100644 --- a/drivers/net/caif/caif_spi.c +++ b/drivers/net/caif/caif_spi.c | |||
@@ -730,11 +730,14 @@ int cfspi_spi_probe(struct platform_device *pdev) | |||
730 | int res; | 730 | int res; |
731 | dev = (struct cfspi_dev *)pdev->dev.platform_data; | 731 | dev = (struct cfspi_dev *)pdev->dev.platform_data; |
732 | 732 | ||
733 | ndev = alloc_netdev(sizeof(struct cfspi), "cfspi%d", | ||
734 | NET_NAME_UNKNOWN, cfspi_setup); | ||
735 | if (!dev) | 733 | if (!dev) |
736 | return -ENODEV; | 734 | return -ENODEV; |
737 | 735 | ||
736 | ndev = alloc_netdev(sizeof(struct cfspi), "cfspi%d", | ||
737 | NET_NAME_UNKNOWN, cfspi_setup); | ||
738 | if (!ndev) | ||
739 | return -ENOMEM; | ||
740 | |||
738 | cfspi = netdev_priv(ndev); | 741 | cfspi = netdev_priv(ndev); |
739 | netif_stop_queue(ndev); | 742 | netif_stop_queue(ndev); |
740 | cfspi->ndev = ndev; | 743 | cfspi->ndev = ndev; |