diff options
| author | Nikolay Aleksandrov <nikolay@nvidia.com> | 2020-09-22 10:30:27 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-09-23 13:24:35 -0700 |
| commit | 36cfec73595ccbaf245b8d6ab31dadbff3962346 (patch) | |
| tree | b8eacb013ce1b2c83a1b71897496335ddc28ddbc | |
| parent | 094b82fd5342fccaf27b1727a55546dc4b32047e (diff) | |
| download | bpf-next-36cfec73595ccbaf245b8d6ab31dadbff3962346.tar.gz | |
net: bridge: mcast: when forwarding handle filter mode and blocked flag
We need to avoid forwarding to ports in MCAST_INCLUDE filter mode when the
mdst entry is a *,G or when the port has the blocked flag.
Signed-off-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/bridge/br_forward.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c index 4d12999e4576a5..e28ffadd137193 100644 --- a/net/bridge/br_forward.c +++ b/net/bridge/br_forward.c @@ -274,10 +274,19 @@ void br_multicast_flood(struct net_bridge_mdb_entry *mdst, struct net_bridge *br = netdev_priv(dev); struct net_bridge_port *prev = NULL; struct net_bridge_port_group *p; + bool allow_mode_include = true; struct hlist_node *rp; rp = rcu_dereference(hlist_first_rcu(&br->router_list)); - p = mdst ? rcu_dereference(mdst->ports) : NULL; + if (mdst) { + p = rcu_dereference(mdst->ports); + if (br_multicast_should_handle_mode(br, mdst->addr.proto) && + br_multicast_is_star_g(&mdst->addr)) + allow_mode_include = false; + } else { + p = NULL; + } + while (p || rp) { struct net_bridge_port *port, *lport, *rport; @@ -292,6 +301,10 @@ void br_multicast_flood(struct net_bridge_mdb_entry *mdst, local_orig); goto delivered; } + if ((!allow_mode_include && + p->filter_mode == MCAST_INCLUDE) || + (p->flags & MDB_PG_FLAGS_BLOCKED)) + goto delivered; } else { port = rport; } |