Commit 382e1eea authored Feb 07, 2017 by Florian Fainelli Committed by David S. Miller Feb 08, 2017

net: dsa: Do not destroy invalid network devices

dsa_slave_create() can fail, and dsa_user_port_unapply() will properly check
for the network device not being NULL before attempting to destroy it. We were
not setting the slave network device as NULL if dsa_slave_create() failed, so
we would later on be calling dsa_slave_destroy() on a now free'd and
unitialized network device, causing crashes in dsa_slave_destroy().

Fixes: 83c0afae ("net: dsa: Add new binding implementation")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 73d2c667

net/dsa/dsa2.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -273,6 +273,7 @@ static int dsa_user_port_apply(struct device_node *port, u32 index,
		if (err) {
		dev_warn(ds->dev, "Failed to create slave %d: %d\n",
		index, err);
		ds->ports[index].netdev = NULL;
		return err;
		}