bridge: don't try to update timers in case of broken MLD queries

Currently we are reading an uninitialized value for the max_delay
variable when snooping an MLD query message of invalid length and would
update our timers with that.

Fixing this by simply ignoring such broken MLD queries (just like we do
for IGMP already).

This is a regression introduced by:
"bridge: disable snooping if there is no querier" (b00589af3b)

Reported-by: Paul Bolle <pebolle@tiscali.nl>
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 2013-08-06 00:32:05 +02:00 committed by David S. Miller
parent aab515d7c3
commit 248ba8ec05

View File

@ -1195,7 +1195,7 @@ static int br_ip6_multicast_query(struct net_bridge *br,
max_delay = msecs_to_jiffies(ntohs(mld->mld_maxdelay)); max_delay = msecs_to_jiffies(ntohs(mld->mld_maxdelay));
if (max_delay) if (max_delay)
group = &mld->mld_mca; group = &mld->mld_mca;
} else if (skb->len >= sizeof(*mld2q)) { } else {
if (!pskb_may_pull(skb, sizeof(*mld2q))) { if (!pskb_may_pull(skb, sizeof(*mld2q))) {
err = -EINVAL; err = -EINVAL;
goto out; goto out;