diff options
| author |   Johan Hovold <johan@kernel.org> | 2016-11-17 17:40:03 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-11-18 13:48:53 -0500 |
| commit | 3420ea88509f9d585b39f36e737022faf0286d9a (patch) | |
| tree | dfcb5b7ff7ccf6d89f8bd6206ba4efe23b65b19d /drivers | |
| parent | net: ethernet: ti: cpsw: fix secondary-emac probe error path (diff) | |
| download | linux-dev-3420ea88509f9d585b39f36e737022faf0286d9a.tar.xz linux-dev-3420ea88509f9d585b39f36e737022faf0286d9a.zip | |
net: ethernet: ti: cpsw: add missing sanity check
Make sure to check for allocation failures before dereferencing a
NULL-pointer during probe.
Fixes: 649a1688c960 ("net: ethernet: ti: cpsw: create common struct to
hold shared driver data")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/ti/cpsw.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 11b2daef3158..1387299030e4 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -2588,6 +2588,9 @@ static int cpsw_probe(struct platform_device *pdev) int irq; cpsw = devm_kzalloc(&pdev->dev, sizeof(struct cpsw_common), GFP_KERNEL); + if (!cpsw) + return -ENOMEM; + cpsw->dev = &pdev->dev; ndev = alloc_etherdev_mq(sizeof(struct cpsw_priv), CPSW_MAX_QUEUES); |