OSDN Git Service

net: dsa: Never offload FDB entries on standalone ports
authorTobias Waldekranz <tobias@waldekranz.com>
Tue, 15 Mar 2022 23:30:33 +0000 (00:30 +0100)
committerJakub Kicinski <kuba@kernel.org>
Thu, 17 Mar 2022 02:36:56 +0000 (19:36 -0700)
If a port joins a bridge that it can't offload, it will fallback to
standalone mode and software bridging. In this case, we never want to
offload any FDB entries to hardware either.

Previously, for host addresses, we would eventually end up in
dsa_port_bridge_host_fdb_add, which would unconditionally dereference
dp->bridge and cause a segfault.

Fixes: c26933639b54 ("net: dsa: request drivers to perform FDB isolation")
Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Link: https://lore.kernel.org/r/20220315233033.1468071-1-tobias@waldekranz.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/dsa/slave.c

index f9cecda..d24b6bf 100644 (file)
@@ -2847,6 +2847,9 @@ static int dsa_slave_fdb_event(struct net_device *dev,
        if (ctx && ctx != dp)
                return 0;
 
+       if (!dp->bridge)
+               return 0;
+
        if (switchdev_fdb_is_dynamically_learned(fdb_info)) {
                if (dsa_port_offloads_bridge_port(dp, orig_dev))
                        return 0;