net: switchdev: zero-initialize struct switchdev_notifier_fdb_info emitted by drivers towards the bridge

vladimiroltean · kuba-moo · commit c35b57ceff90 · 2021-08-10T13:22:57.000-07:00
The blamed commit added a new field to struct switchdev_notifier_fdb_info, but did not make sure that all call paths set it to something valid. For example, a switchdev driver may emit a SWITCHDEV_FDB_ADD_TO_BRIDGE notifier, and since the 'is_local' flag is not set, it contains junk from the stack, so the bridge might interpret those notifications as being for local FDB entries when that was not intended. To avoid that now and in the future, zero-initialize all switchdev_notifier_fdb_info structures created by drivers such that all newly added fields to not need to touch drivers again. Fixes: 2c4eca3 ("net: bridge: switchdev: include local flag in FDB notifications") Reported-by: Ido Schimmel <idosch@idosch.org> Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Reviewed-by: Ido Schimmel <idosch@nvidia.com> Tested-by: Ido Schimmel <idosch@nvidia.com> Reviewed-by: Leon Romanovsky <leonro@nvidia.com> Reviewed-by: Karsten Graul <kgraul@linux.ibm.com> Link: https://lore.kernel.org/r/20210810115024.1629983-1-vladimir.oltean@nxp.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
diff --git a/drivers/net/ethernet/marvell/prestera/prestera_switchdev.c b/drivers/net/ethernet/marvell/prestera/prestera_switchdev.c
@@ -748,7 +748,7 @@ static void
 prestera_fdb_offload_notify(struct prestera_port *port,
 			    struct switchdev_notifier_fdb_info *info)
 {
-	struct switchdev_notifier_fdb_info send_info;
+	struct switchdev_notifier_fdb_info send_info = {};
 
 	send_info.addr = info->addr;
 	send_info.vid = info->vid;
@@ -1123,7 +1123,7 @@ static int prestera_switchdev_blk_event(struct notifier_block *unused,
 static void prestera_fdb_event(struct prestera_switch *sw,
 			       struct prestera_event *evt, void *arg)
 {
-	struct switchdev_notifier_fdb_info info;
+	struct switchdev_notifier_fdb_info info = {};
 	struct net_device *dev = NULL;
 	struct prestera_port *port;
 	struct prestera_lag *lag;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.c b/drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.c
@@ -69,7 +69,7 @@ static void
 mlx5_esw_bridge_fdb_offload_notify(struct net_device *dev, const unsigned char *addr, u16 vid,
 				   unsigned long val)
 {
-	struct switchdev_notifier_fdb_info send_info;
+	struct switchdev_notifier_fdb_info send_info = {};
 
 	send_info.addr = addr;
 	send_info.vid = vid;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
@@ -9079,7 +9079,7 @@ mlxsw_sp_rif_fid_fid_get(struct mlxsw_sp_rif *rif,
 
 static void mlxsw_sp_rif_fid_fdb_del(struct mlxsw_sp_rif *rif, const char *mac)
 {
-	struct switchdev_notifier_fdb_info info;
+	struct switchdev_notifier_fdb_info info = {};
 	struct net_device *dev;
 
 	dev = br_fdb_find_port(rif->dev, mac, 0);
@@ -9127,8 +9127,8 @@ mlxsw_sp_rif_vlan_fid_get(struct mlxsw_sp_rif *rif,
 
 static void mlxsw_sp_rif_vlan_fdb_del(struct mlxsw_sp_rif *rif, const char *mac)
 {
+	struct switchdev_notifier_fdb_info info = {};
 	u16 vid = mlxsw_sp_fid_8021q_vid(rif->fid);
-	struct switchdev_notifier_fdb_info info;
 	struct net_device *br_dev;
 	struct net_device *dev;
 
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
@@ -2508,7 +2508,7 @@ mlxsw_sp_fdb_call_notifiers(enum switchdev_notifier_type type,
 			    const char *mac, u16 vid,
 			    struct net_device *dev, bool offloaded)
 {
-	struct switchdev_notifier_fdb_info info;
+	struct switchdev_notifier_fdb_info info = {};
 
 	info.addr = mac;
 	info.vid = vid;
diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_mactable.c b/drivers/net/ethernet/microchip/sparx5/sparx5_mactable.c
@@ -277,7 +277,7 @@ static void sparx5_fdb_call_notifiers(enum switchdev_notifier_type type,
 				      const char *mac, u16 vid,
 				      struct net_device *dev, bool offloaded)
 {
-	struct switchdev_notifier_fdb_info info;
+	struct switchdev_notifier_fdb_info info = {};
 
 	info.addr = mac;
 	info.vid = vid;
diff --git a/drivers/net/ethernet/rocker/rocker_main.c b/drivers/net/ethernet/rocker/rocker_main.c
@@ -2715,7 +2715,7 @@ static void
 rocker_fdb_offload_notify(struct rocker_port *rocker_port,
 			  struct switchdev_notifier_fdb_info *recv_info)
 {
-	struct switchdev_notifier_fdb_info info;
+	struct switchdev_notifier_fdb_info info = {};
 
 	info.addr = recv_info->addr;
 	info.vid = recv_info->vid;
diff --git a/drivers/net/ethernet/rocker/rocker_ofdpa.c b/drivers/net/ethernet/rocker/rocker_ofdpa.c
@@ -1822,7 +1822,7 @@ static void ofdpa_port_fdb_learn_work(struct work_struct *work)
 		container_of(work, struct ofdpa_fdb_learn_work, work);
 	bool removing = (lw->flags & OFDPA_OP_FLAG_REMOVE);
 	bool learned = (lw->flags & OFDPA_OP_FLAG_LEARNED);
-	struct switchdev_notifier_fdb_info info;
+	struct switchdev_notifier_fdb_info info = {};
 
 	info.addr = lw->addr;
 	info.vid = lw->vid;
diff --git a/drivers/net/ethernet/ti/am65-cpsw-switchdev.c b/drivers/net/ethernet/ti/am65-cpsw-switchdev.c
@@ -358,7 +358,7 @@ static int am65_cpsw_port_obj_del(struct net_device *ndev, const void *ctx,
 static void am65_cpsw_fdb_offload_notify(struct net_device *ndev,
 					 struct switchdev_notifier_fdb_info *rcv)
 {
-	struct switchdev_notifier_fdb_info info;
+	struct switchdev_notifier_fdb_info info = {};
 
 	info.addr = rcv->addr;
 	info.vid = rcv->vid;
diff --git a/drivers/net/ethernet/ti/cpsw_switchdev.c b/drivers/net/ethernet/ti/cpsw_switchdev.c
@@ -368,7 +368,7 @@ static int cpsw_port_obj_del(struct net_device *ndev, const void *ctx,
 static void cpsw_fdb_offload_notify(struct net_device *ndev,
 				    struct switchdev_notifier_fdb_info *rcv)
 {
-	struct switchdev_notifier_fdb_info info;
+	struct switchdev_notifier_fdb_info info = {};
 
 	info.addr = rcv->addr;
 	info.vid = rcv->vid;
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
@@ -279,7 +279,7 @@ static void qeth_l2_set_pnso_mode(struct qeth_card *card,
 
 static void qeth_l2_dev2br_fdb_flush(struct qeth_card *card)
 {
-	struct switchdev_notifier_fdb_info info;
+	struct switchdev_notifier_fdb_info info = {};
 
 	QETH_CARD_TEXT(card, 2, "fdbflush");
 
@@ -679,7 +679,7 @@ static void qeth_l2_dev2br_fdb_notify(struct qeth_card *card, u8 code,
 				      struct net_if_token *token,
 				      struct mac_addr_lnid *addr_lnid)
 {
-	struct switchdev_notifier_fdb_info info;
+	struct switchdev_notifier_fdb_info info = {};
 	u8 ntfy_mac[ETH_ALEN];
 
 	ether_addr_copy(ntfy_mac, addr_lnid->mac);
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
@@ -2291,8 +2291,8 @@ static int dsa_slave_netdevice_event(struct notifier_block *nb,
 static void
 dsa_fdb_offload_notify(struct dsa_switchdev_event_work *switchdev_work)
 {
+	struct switchdev_notifier_fdb_info info = {};
 	struct dsa_switch *ds = switchdev_work->ds;
-	struct switchdev_notifier_fdb_info info;
 	struct dsa_port *dp;
 
 	if (!dsa_is_user_port(ds, switchdev_work->port))

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ static void`
`69`	`69`	`mlx5_esw_bridge_fdb_offload_notify(struct net_device dev, const unsigned char addr, u16 vid,`
`70`	`70`	`unsigned long val)`
`71`	`71`	`{`
`72`		`- struct switchdev_notifier_fdb_info send_info;`
	`72`	`+ struct switchdev_notifier_fdb_info send_info = {};`
`73`	`73`
`74`	`74`	`send_info.addr = addr;`
`75`	`75`	`send_info.vid = vid;`
Original file line number	Diff line number	Diff line change
`@@ -9079,7 +9079,7 @@ mlxsw_sp_rif_fid_fid_get(struct mlxsw_sp_rif *rif,`
`9079`	`9079`
`9080`	`9080`	`static void mlxsw_sp_rif_fid_fdb_del(struct mlxsw_sp_rif rif, const char mac)`
`9081`	`9081`	`{`
`9082`		`- struct switchdev_notifier_fdb_info info;`
	`9082`	`+ struct switchdev_notifier_fdb_info info = {};`
`9083`	`9083`	`struct net_device *dev;`
`9084`	`9084`
`9085`	`9085`	`dev = br_fdb_find_port(rif->dev, mac, 0);`
`@@ -9127,8 +9127,8 @@ mlxsw_sp_rif_vlan_fid_get(struct mlxsw_sp_rif *rif,`
`9127`	`9127`
`9128`	`9128`	`static void mlxsw_sp_rif_vlan_fdb_del(struct mlxsw_sp_rif rif, const char mac)`
`9129`	`9129`	`{`
	`9130`	`+ struct switchdev_notifier_fdb_info info = {};`
`9130`	`9131`	`u16 vid = mlxsw_sp_fid_8021q_vid(rif->fid);`
`9131`		`- struct switchdev_notifier_fdb_info info;`
`9132`	`9132`	`struct net_device *br_dev;`
`9133`	`9133`	`struct net_device *dev;`
`9134`	`9134`
Original file line number	Diff line number	Diff line change
`@@ -2508,7 +2508,7 @@ mlxsw_sp_fdb_call_notifiers(enum switchdev_notifier_type type,`
`2508`	`2508`	`const char *mac, u16 vid,`
`2509`	`2509`	`struct net_device *dev, bool offloaded)`
`2510`	`2510`	`{`
`2511`		`- struct switchdev_notifier_fdb_info info;`
	`2511`	`+ struct switchdev_notifier_fdb_info info = {};`
`2512`	`2512`
`2513`	`2513`	`info.addr = mac;`
`2514`	`2514`	`info.vid = vid;`
Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,7 @@ static void sparx5_fdb_call_notifiers(enum switchdev_notifier_type type,`
`277`	`277`	`const char *mac, u16 vid,`
`278`	`278`	`struct net_device *dev, bool offloaded)`
`279`	`279`	`{`
`280`		`- struct switchdev_notifier_fdb_info info;`
	`280`	`+ struct switchdev_notifier_fdb_info info = {};`
`281`	`281`
`282`	`282`	`info.addr = mac;`
`283`	`283`	`info.vid = vid;`
Original file line number	Diff line number	Diff line change
`@@ -2715,7 +2715,7 @@ static void`
`2715`	`2715`	`rocker_fdb_offload_notify(struct rocker_port *rocker_port,`
`2716`	`2716`	`struct switchdev_notifier_fdb_info *recv_info)`
`2717`	`2717`	`{`
`2718`		`- struct switchdev_notifier_fdb_info info;`
	`2718`	`+ struct switchdev_notifier_fdb_info info = {};`
`2719`	`2719`
`2720`	`2720`	`info.addr = recv_info->addr;`
`2721`	`2721`	`info.vid = recv_info->vid;`
Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,7 @@ static int am65_cpsw_port_obj_del(struct net_device ndev, const void ctx,`
`358`	`358`	`static void am65_cpsw_fdb_offload_notify(struct net_device *ndev,`
`359`	`359`	`struct switchdev_notifier_fdb_info *rcv)`
`360`	`360`	`{`
`361`		`- struct switchdev_notifier_fdb_info info;`
	`361`	`+ struct switchdev_notifier_fdb_info info = {};`
`362`	`362`
`363`	`363`	`info.addr = rcv->addr;`
`364`	`364`	`info.vid = rcv->vid;`
Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ static int cpsw_port_obj_del(struct net_device ndev, const void ctx,`
`368`	`368`	`static void cpsw_fdb_offload_notify(struct net_device *ndev,`
`369`	`369`	`struct switchdev_notifier_fdb_info *rcv)`
`370`	`370`	`{`
`371`		`- struct switchdev_notifier_fdb_info info;`
	`371`	`+ struct switchdev_notifier_fdb_info info = {};`
`372`	`372`
`373`	`373`	`info.addr = rcv->addr;`
`374`	`374`	`info.vid = rcv->vid;`
Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ static void qeth_l2_set_pnso_mode(struct qeth_card *card,`
`279`	`279`
`280`	`280`	`static void qeth_l2_dev2br_fdb_flush(struct qeth_card *card)`
`281`	`281`	`{`
`282`		`- struct switchdev_notifier_fdb_info info;`
	`282`	`+ struct switchdev_notifier_fdb_info info = {};`
`283`	`283`
`284`	`284`	`QETH_CARD_TEXT(card, 2, "fdbflush");`
`285`	`285`
`@@ -679,7 +679,7 @@ static void qeth_l2_dev2br_fdb_notify(struct qeth_card *card, u8 code,`
`679`	`679`	`struct net_if_token *token,`
`680`	`680`	`struct mac_addr_lnid *addr_lnid)`
`681`	`681`	`{`
`682`		`- struct switchdev_notifier_fdb_info info;`
	`682`	`+ struct switchdev_notifier_fdb_info info = {};`
`683`	`683`	`u8 ntfy_mac[ETH_ALEN];`
`684`	`684`
`685`	`685`	`ether_addr_copy(ntfy_mac, addr_lnid->mac);`