diff options
| author | Vladimir Oltean <vladimir.oltean@nxp.com> | 2021-08-24 00:22:55 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-08-24 11:30:58 +0300 |
| commit | 09dba21b432a13369d6d600941c4902237218f20 (patch) | |
| tree | eb0a88e31502e101c9329472a2f35b20fefc299d /net/dsa | |
| parent | 0384dd9d2d807b7d1470ce0abd549b8855037f99 (diff) | |
| download | linux-09dba21b432a13369d6d600941c4902237218f20.tar.xz | |
net: dsa: don't call switchdev_bridge_port_unoffload for unoffloaded bridge ports
For ports that have a NULL dp->bridge_dev, dsa_port_to_bridge_port()
also returns NULL as expected.
Issue #1 is that we are performing a NULL pointer dereference on brport_dev.
Issue #2 is that these are ports on which switchdev_bridge_port_offload
has not been called, so we should not call switchdev_bridge_port_unoffload
on them either.
Both issues are addressed by checking against a NULL brport_dev in
dsa_port_pre_bridge_leave and exiting early.
Fixes: 2f5dc00f7a3e ("net: bridge: switchdev: let drivers inform which bridge ports are offloaded")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa')
| -rw-r--r-- | net/dsa/port.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/dsa/port.c b/net/dsa/port.c index 4fbe81ffb1ce..3b775d7adee2 100644 --- a/net/dsa/port.c +++ b/net/dsa/port.c @@ -373,6 +373,10 @@ void dsa_port_pre_bridge_leave(struct dsa_port *dp, struct net_device *br) { struct net_device *brport_dev = dsa_port_to_bridge_port(dp); + /* Don't try to unoffload something that is not offloaded */ + if (!brport_dev) + return; + switchdev_bridge_port_unoffload(brport_dev, dp, &dsa_slave_switchdev_notifier, &dsa_slave_switchdev_blocking_notifier); |