Commit 8fd36358 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by Jakub Kicinski

net: dsa: fix panic on shutdown if multi-chip tree failed to probe

DSA probing is atypical because a tree of devices must probe all at
once, so out of N switches which call dsa_tree_setup_routing_table()
during probe, for (N - 1) of them, "complete" will return false and they
will exit probing early. The Nth switch will set up the whole tree on
their behalf.

The implication is that for (N - 1) switches, the driver binds to the
device successfully, without doing anything. When the driver is bound,
the ->shutdown() method may run. But if the Nth switch has failed to
initialize the tree, there is nothing to do for the (N - 1) driver
instances, since the slave devices have not been created, etc. Moreover,
dsa_switch_shutdown() expects that the calling @ds has been in fact
initialized, so it jumps at dereferencing the various data structures,
which is incorrect.

Avoid the ensuing NULL pointer dereferences by simply checking whether
the Nth switch has previously set "ds->setup = true" for the switch
which is currently shutting down. The entire setup is serialized under
dsa2_mutex which we already hold.

Fixes: 0650bf52 ("net: dsa: be compatible with masters which unregister on shutdown")
Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Link: https://lore.kernel.org/r/20220318195443.275026-1-vladimir.oltean@nxp.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 60b44ca6
...@@ -1722,6 +1722,10 @@ void dsa_switch_shutdown(struct dsa_switch *ds) ...@@ -1722,6 +1722,10 @@ void dsa_switch_shutdown(struct dsa_switch *ds)
struct dsa_port *dp; struct dsa_port *dp;
mutex_lock(&dsa2_mutex); mutex_lock(&dsa2_mutex);
if (!ds->setup)
goto out;
rtnl_lock(); rtnl_lock();
dsa_switch_for_each_user_port(dp, ds) { dsa_switch_for_each_user_port(dp, ds) {
...@@ -1738,6 +1742,7 @@ void dsa_switch_shutdown(struct dsa_switch *ds) ...@@ -1738,6 +1742,7 @@ void dsa_switch_shutdown(struct dsa_switch *ds)
dp->master->dsa_ptr = NULL; dp->master->dsa_ptr = NULL;
rtnl_unlock(); rtnl_unlock();
out:
mutex_unlock(&dsa2_mutex); mutex_unlock(&dsa2_mutex);
} }
EXPORT_SYMBOL_GPL(dsa_switch_shutdown); EXPORT_SYMBOL_GPL(dsa_switch_shutdown);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment