diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2017-02-07 23:10:13 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-08 14:50:51 -0500 |
| commit | 382e1eea2d983cd2343482c6a638f497bb44a636 (patch) | |
| tree | 0799402b4792dada8d205c23346dbdeddc571bd5 /net/dsa | |
| parent | 73d2c6678e6c3af7e7a42b1e78cd0211782ade32 (diff) | |
| download | linux-382e1eea2d983cd2343482c6a638f497bb44a636.tar.gz linux-382e1eea2d983cd2343482c6a638f497bb44a636.tar.bz2 linux-382e1eea2d983cd2343482c6a638f497bb44a636.zip | |
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")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa')
| -rw-r--r-- | net/dsa/dsa2.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c index da3862124545..0f99297b2fb3 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c @@ -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; } |