* [PATCH net] net: dsa: Do not destroy invalid network devices
@ 2017-02-08 7:10 Florian Fainelli
2017-02-08 19:51 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Florian Fainelli @ 2017-02-08 7:10 UTC (permalink / raw)
To: netdev; +Cc: davem, andrew, vivien.didelot, Florian Fainelli
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>
---
net/dsa/dsa2.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index 6f5f0a2ad256..737be6470c7f 100644
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -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;
}
--
2.9.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net] net: dsa: Do not destroy invalid network devices
2017-02-08 7:10 [PATCH net] net: dsa: Do not destroy invalid network devices Florian Fainelli
@ 2017-02-08 19:51 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2017-02-08 19:51 UTC (permalink / raw)
To: f.fainelli; +Cc: netdev, andrew, vivien.didelot
From: Florian Fainelli <f.fainelli@gmail.com>
Date: Tue, 7 Feb 2017 23:10:13 -0800
> 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>
Applied and queued up for -stable, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-02-08 19:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-08 7:10 [PATCH net] net: dsa: Do not destroy invalid network devices Florian Fainelli
2017-02-08 19:51 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).