FAILED: patch "[PATCH] net: sparx5: mdb add/del handle non-sparx5 devices" failed to apply to 5.18-stable tree

PATCH [email protected] 1 participant 1 message Jul 4, 2022

Subsystems (3)

Network drivers Stable branch Arm/Microchip Sparx5 SoC support

lore

Share & tools

lore

[email protected]

author maintainer

2022-07-04 13:16 UTC #0 lore raw

The patch below does not apply to the 5.18-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 9c5de246c1dbe785268fc2e83c88624b92e4ec93 Mon Sep 17 00:00:00 2001
From: Casper Andersson <[email protected]>
Date: Thu, 30 Jun 2022 14:22:26 +0200
Subject: [PATCH] net: sparx5: mdb add/del handle non-sparx5 devices

When adding/deleting mdb entries on other net_devices, eg., tap interfaces, it should not crash.

Fixes 3bacfccdcb2d ("net: sparx5: Add mdb handlers")

Signed-off-by Casper Andersson <[email protected]>

Reviewed-by Steen Hegelund <[email protected]>

Link https://lore.kernel.org/r/[email protected] open here

Signed-off-by Jakub Kicinski <[email protected]>

drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c +6 -0

index 3429660cd2e5..5edc8b7176c8 100644
@@ -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;