luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bridge: multicast: enable snooping on general queries only

Browse Source 
Without this check someone could easily create a denial of service
by injecting multicast-specific queries to enable the bridge
snooping part if no real querier issuing periodic general queries
is present on the link which would result in the bridge wrongly
shutting down ports for multicast traffic as the bridge did not learn
about these listeners.

With this patch the snooping code is enabled upon receiving valid,
general queries only.

Signed-off-by: Linus Lüssing <linus.luessing@web.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Linus Lüssing 2014-03-10 22:25:25 +01:00 committed by David S. Miller
parent 9ed973cc40
commit 20a599bec9
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/bridge/br_multicast.c
View File

@ -1127,9 +1127,10 @@ static void br_multicast_query_received(struct net_bridge *br,
struct net_bridge_port *port,
struct bridge_mcast_querier *querier,
int saddr,
bool is_general_query,
unsigned long max_delay)
{
if (saddr)
if (saddr && is_general_query)
br_multicast_update_querier_timer(br, querier, max_delay);
else if (timer_pending(&querier->timer))
return;
@ -1190,7 +1191,7 @@ static int br_ip4_multicast_query(struct net_bridge *br,
}
br_multicast_query_received(br, port, &br->ip4_querier, !!iph->saddr,
max_delay);
!group, max_delay);
if (!group)
goto out;
@ -1282,7 +1283,8 @@ static int br_ip6_multicast_query(struct net_bridge *br,
}
br_multicast_query_received(br, port, &br->ip6_querier,
!ipv6_addr_any(&ip6h->saddr), max_delay);
!ipv6_addr_any(&ip6h->saddr),
is_general_query, max_delay);
if (!group)
goto out;