From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 18 May 2021 13:57:24 +0000 (+0200)
Subject: 5.12-stable patches
X-Git-Tag: v5.4.120~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=268b03a8b50d6392538918257e5b82a65d8df6cc;p=thirdparty%2Fkernel%2Fstable-queue.git

5.12-stable patches

added patches:
	net-bridge-fix-error-in-br_multicast_add_port-when-config_net_switchdev-n.patch
---

diff --git a/queue-5.12/net-bridge-fix-error-in-br_multicast_add_port-when-config_net_switchdev-n.patch b/queue-5.12/net-bridge-fix-error-in-br_multicast_add_port-when-config_net_switchdev-n.patch
new file mode 100644
index 00000000000..e2d9cd07e26
--- /dev/null
+++ b/queue-5.12/net-bridge-fix-error-in-br_multicast_add_port-when-config_net_switchdev-n.patch
@@ -0,0 +1,37 @@
+From 68f5c12abbc9b6f8c5eea16c62f8b7be70793163 Mon Sep 17 00:00:00 2001
+From: Vladimir Oltean <vladimir.oltean@nxp.com>
+Date: Wed, 21 Apr 2021 21:44:20 +0300
+Subject: net: bridge: fix error in br_multicast_add_port when CONFIG_NET_SWITCHDEV=n
+
+From: Vladimir Oltean <vladimir.oltean@nxp.com>
+
+commit 68f5c12abbc9b6f8c5eea16c62f8b7be70793163 upstream.
+
+When CONFIG_NET_SWITCHDEV is disabled, the shim for switchdev_port_attr_set
+inside br_mc_disabled_update returns -EOPNOTSUPP. This is not caught,
+and propagated to the caller of br_multicast_add_port, preventing ports
+from joining the bridge.
+
+Reported-by: Christian Borntraeger <borntraeger@de.ibm.com>
+Fixes: ae1ea84b33da ("net: bridge: propagate error code and extack from br_mc_disabled_update")
+Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
+Acked-by: Florian Fainelli <f.fainelli@gmail.com>
+Tested-by: Christian Borntraeger <borntraeger@de.ibm.com>
+Acked-by: Nikolay Aleksandrov <nikolay@nvidia.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/bridge/br_multicast.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/net/bridge/br_multicast.c
++++ b/net/bridge/br_multicast.c
+@@ -1625,7 +1625,7 @@ int br_multicast_add_port(struct net_bri
+ 				    br_opt_get(port->br,
+ 					       BROPT_MULTICAST_ENABLED),
+ 				    NULL);
+-	if (err)
++	if (err && err != -EOPNOTSUPP)
+ 		return err;
+ 
+ 	port->mcast_stats = netdev_alloc_pcpu_stats(struct bridge_mcast_stats);
diff --git a/queue-5.12/series b/queue-5.12/series
index 61773b09cc3..70e000a219a 100644
--- a/queue-5.12/series
+++ b/queue-5.12/series
@@ -360,3 +360,4 @@ debugfs-make-debugfs_allow-ro-after-init.patch
 ext4-fix-debug-format-string-warning.patch
 nvme-do-not-try-to-reconfigure-apst-when-the-controller-is-not-live.patch
 asoc-rsnd-check-all-busif-status-when-error.patch
+net-bridge-fix-error-in-br_multicast_add_port-when-config_net_switchdev-n.patch