summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Jaillet <christophe.jaillet@wanadoo.fr>2017-05-06 07:29:45 +0200
committerDavid S. Miller <davem@davemloft.net>2017-05-08 14:58:36 -0400
commit8ce7aaaa9797f944ad2f50e5160c8a20a473aedf (patch)
treeae6574bb9c4715131a3d0729c29c3be1e5c32fc6
parentd62844a825e87da345e11639e98deb617ef11e08 (diff)
downloadlinux-8ce7aaaa9797f944ad2f50e5160c8a20a473aedf.tar.gz
linux-8ce7aaaa9797f944ad2f50e5160c8a20a473aedf.tar.bz2
linux-8ce7aaaa9797f944ad2f50e5160c8a20a473aedf.zip
net: dsa: loop: Check for memory allocation failure
If 'devm_kzalloc' fails, a NULL pointer will be dereferenced. Return -ENOMEM instead, as done for some other memory allocation just a few lines above. Fixes: 98cd1552ea27 ("net: dsa: Mock-up driver") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Acked-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/dsa/dsa_loop.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/dsa/dsa_loop.c b/drivers/net/dsa/dsa_loop.c
index f0fc4de4fc9a..a19e1781e9bb 100644
--- a/drivers/net/dsa/dsa_loop.c
+++ b/drivers/net/dsa/dsa_loop.c
@@ -256,6 +256,9 @@ static int dsa_loop_drv_probe(struct mdio_device *mdiodev)
return -ENOMEM;
ps = devm_kzalloc(&mdiodev->dev, sizeof(*ps), GFP_KERNEL);
+ if (!ps)
+ return -ENOMEM;
+
ps->netdev = dev_get_by_name(&init_net, pdata->netdev);
if (!ps->netdev)
return -EPROBE_DEFER;