| Message ID | 20220628075546.3560083-1-casper.casan@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: sparx5: mdb add/del handle non-sparx5 devices | expand |
Hi Casper, On Tue, 2022-06-28 at 09:55 +0200, Casper Andersson wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > When adding/deleting mdb entries on other net_devices, eg., tap > interfaces, it should not crash. > > Signed-off-by: Casper Andersson <casper.casan@gmail.com> > --- > drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c > b/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c > index 40ef9fad3a77..ec07f7d0528c 100644 > --- a/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c > +++ b/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c > @@ -397,6 +397,9 @@ static int sparx5_handle_port_mdb_add(struct net_device *dev, > bool is_host; > int res, err; > > + if (!sparx5_netdevice_check(dev)) > + return -EOPNOTSUPP; > + > is_host = netif_is_bridge_master(v->obj.orig_dev); > > /* When VLAN unaware the vlan value is not parsed and we receive vid 0. > @@ -480,6 +483,9 @@ static int sparx5_handle_port_mdb_del(struct net_device *dev, > u32 mact_entry, res, pgid_entry[3], misc_cfg; > bool host_ena; > > + if (!sparx5_netdevice_check(dev)) > + return -EOPNOTSUPP; > + > if (!br_vlan_enabled(spx5->hw_bridge_dev)) > vid = 1; > else > -- > 2.30.2 > Indeed! Reviewed-by: Steen Hegelund <Steen.Hegelund@microchip.com>
On Tue, 28 Jun 2022 14:55:22 +0200 Steen Hegelund wrote: > On Tue, 2022-06-28 at 09:55 +0200, Casper Andersson wrote: > > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > > > When adding/deleting mdb entries on other net_devices, eg., tap > > interfaces, it should not crash. > > > > Signed-off-by: Casper Andersson <casper.casan@gmail.com> > > Reviewed-by: Steen Hegelund <Steen.Hegelund@microchip.com> We need a Fixes tag here, when did it start crashing?
Sorry, yes. This is supposed to go to net, not net-next. I will resubmit with a fixes tag. Best Regards, Casper On 2022-06-29 20:22, Jakub Kicinski wrote: > On Tue, 28 Jun 2022 14:55:22 +0200 Steen Hegelund wrote: > > On Tue, 2022-06-28 at 09:55 +0200, Casper Andersson wrote: > > > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > > > > > When adding/deleting mdb entries on other net_devices, eg., tap > > > interfaces, it should not crash. > > > > > > Signed-off-by: Casper Andersson <casper.casan@gmail.com> > > > > Reviewed-by: Steen Hegelund <Steen.Hegelund@microchip.com> > > We need a Fixes tag here, when did it start crashing?
diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c b/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c index 40ef9fad3a77..ec07f7d0528c 100644 --- a/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c +++ b/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c @@ -397,6 +397,9 @@ static int sparx5_handle_port_mdb_add(struct net_device *dev, bool is_host; int res, err; + if (!sparx5_netdevice_check(dev)) + return -EOPNOTSUPP; + is_host = netif_is_bridge_master(v->obj.orig_dev); /* When VLAN unaware the vlan value is not parsed and we receive vid 0. @@ -480,6 +483,9 @@ static int sparx5_handle_port_mdb_del(struct net_device *dev, u32 mact_entry, res, pgid_entry[3], misc_cfg; bool host_ena; + if (!sparx5_netdevice_check(dev)) + return -EOPNOTSUPP; + if (!br_vlan_enabled(spx5->hw_bridge_dev)) vid = 1; else
When adding/deleting mdb entries on other net_devices, eg., tap interfaces, it should not crash. Signed-off-by: Casper Andersson <casper.casan@gmail.com> --- drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c | 6 ++++++ 1 file changed, 6 insertions(+)