Commit 36cfec73 authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller
Browse files

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: default avatarNikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 094b82fd

net/bridge/br_forward.c

+14 −1
Original line number Diff line number Diff line
@@ -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;

		}