| Message ID | 20220630122226.316812-1-casper.casan@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9c5de246c1dbe785268fc2e83c88624b92e4ec93 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net: sparx5: mdb add/del handle non-sparx5 devices | expand |
On Thu, 30 Jun 2022 14:22:26 +0200 Casper Andersson wrote:
> Fixes: 3bacfccdcb2d
Please note the correct format includes the title, so:
Fixes: 3bacfccdcb2d ("net: sparx5: Add mdb handlers")
Also you should have kept the review tags you already received.
I'll fix when applying, thanks.
Hello: This patch was applied to netdev/net.git (master) by Jakub Kicinski <kuba@kernel.org>: On Thu, 30 Jun 2022 14:22:26 +0200 you wrote: > When adding/deleting mdb entries on other net_devices, eg., tap > interfaces, it should not crash. > > Fixes: 3bacfccdcb2d > > Signed-off-by: Casper Andersson <casper.casan@gmail.com> > > [...] Here is the summary with links: - [net] net: sparx5: mdb add/del handle non-sparx5 devices https://git.kernel.org/netdev/net/c/9c5de246c1db You are awesome, thank you!
diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c b/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c index 3429660cd2e5..5edc8b7176c8 100644 --- a/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c +++ b/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c @@ -396,6 +396,9 @@ static int sparx5_handle_port_mdb_add(struct net_device *dev, u32 mact_entry; int res, err; + if (!sparx5_netdevice_check(dev)) + return -EOPNOTSUPP; + if (netif_is_bridge_master(v->obj.orig_dev)) { sparx5_mact_learn(spx5, PGID_CPU, v->addr, v->vid); return 0; @@ -466,6 +469,9 @@ static int sparx5_handle_port_mdb_del(struct net_device *dev, u32 mact_entry, res, pgid_entry[3]; int err; + if (!sparx5_netdevice_check(dev)) + return -EOPNOTSUPP; + if (netif_is_bridge_master(v->obj.orig_dev)) { sparx5_mact_forget(spx5, v->addr, v->vid); return 0;
When adding/deleting mdb entries on other net_devices, eg., tap interfaces, it should not crash. Fixes: 3bacfccdcb2d Signed-off-by: Casper Andersson <casper.casan@gmail.com> --- drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c | 6 ++++++ 1 file changed, 6 insertions(+)