From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Linus=20L=C3=BCssing?= Subject: [PATCH] bridge: don't try to update timers in case of broken MLD queries Date: Tue, 6 Aug 2013 00:32:05 +0200 Message-ID: <1375741925-22179-1-git-send-email-linus.luessing@web.de> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Cc: Paul Bolle , Herbert Xu , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Adam Baker , Stephen Hemminger , =?UTF-8?q?Linus=20L=C3=BCssing?= , "David S. Miller" , Cong Wang To: bridge@lists.linux-foundation.org Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: bridge-bounces@lists.linux-foundation.org Errors-To: bridge-bounces@lists.linux-foundation.org List-Id: netdev.vger.kernel.org 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" (b00589af3b04) Reported-by: Paul Bolle Signed-off-by: Linus L=C3=BCssing --- net/bridge/br_multicast.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 61c5e81..08e576a 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -1195,7 +1195,7 @@ static int br_ip6_multicast_query(struct net_bridge= *br, max_delay =3D msecs_to_jiffies(ntohs(mld->mld_maxdelay)); if (max_delay) group =3D &mld->mld_mca; - } else if (skb->len >=3D sizeof(*mld2q)) { + } else { if (!pskb_may_pull(skb, sizeof(*mld2q))) { err =3D -EINVAL; goto out; --=20 1.7.10.4