diff options
| author | Vladimir Oltean <vladimir.oltean@nxp.com> | 2021-07-13 12:40:21 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-07-13 14:47:10 -0700 |
| commit | bcb9928a155444dbd212473e60241ca0a7f641e1 (patch) | |
| tree | 7c8f2457a62341b03ff2ab08f0e14c9292bbd506 /net | |
| parent | 28efd208530c7690a275b18915960c26c5b4d9d5 (diff) | |
| download | linux-bcb9928a155444dbd212473e60241ca0a7f641e1.tar.bz2 | |
net: dsa: properly check for the bridge_leave methods in dsa_switch_bridge_leave()
This was not caught because there is no switch driver which implements
the .port_bridge_join but not .port_bridge_leave method, but it should
nonetheless be fixed, as in certain conditions (driver development) it
might lead to NULL pointer dereference.
Fixes: f66a6a69f97a ("net: dsa: permit cross-chip bridging between all trees in the system")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/dsa/switch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dsa/switch.c b/net/dsa/switch.c index 248455145982..5ece05dfd8f2 100644 --- a/net/dsa/switch.c +++ b/net/dsa/switch.c @@ -113,11 +113,11 @@ static int dsa_switch_bridge_leave(struct dsa_switch *ds, int err, port; if (dst->index == info->tree_index && ds->index == info->sw_index && - ds->ops->port_bridge_join) + ds->ops->port_bridge_leave) ds->ops->port_bridge_leave(ds, info->port, info->br); if ((dst->index != info->tree_index || ds->index != info->sw_index) && - ds->ops->crosschip_bridge_join) + ds->ops->crosschip_bridge_leave) ds->ops->crosschip_bridge_leave(ds, info->tree_index, info->sw_index, info->port, info->br); |