Skip to contentSkip to conversation

net: dsa: Do not destroy invalid network devices

PATCH In review Florian Fainelli 2 participants 2 messages Feb 8, 2017

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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 83c0afaec7b7 ("net: dsa: Add new binding implementation")
---
 net/dsa/dsa2.c | 1 +
 1 file changed, 1 insertion(+)
net/dsa/dsa2.c +1 -0
index 6f5f0a2ad256..737be6470c7f 100644
@@ -271,6 +271,7 @@ static int dsa_user_port_apply(struct dsa_port *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;
 	}
 
Signature · 1 line
2.9.3
maintainer
#1 lore raw

From: Florian Fainelli <[email protected]>
Date: Tue, 7 Feb 2017 23:10:13 -0800

Quoted 8 lines

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 83c0afaec7b7 ("net: dsa: Add new binding implementation")

Applied and queued up for -stable, thanks.