Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8c1f65c authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

igmp: Avoid zero delay when receiving odd mixture of IGMP queries 



Commit 5b7c8406 ('ipv4: correct IGMP
behavior on v3 query during v2-compatibility mode') added yet another
case for query parsing, which can result in max_delay = 0.  Substitute
a value of 1, as in the usual v3 case.

Reported-by: default avatarSimon McVittie <smcv@debian.org>
References: http://bugs.debian.org/654876


Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e5686ad8

net/ipv4/igmp.c

+2 −0
Original line number Diff line number Diff line
@@ -880,6 +880,8 @@ static void igmp_heard_query(struct in_device *in_dev, struct sk_buff *skb, 
		 * to be intended in a v3 query.

		 */

		max_delay = IGMPV3_MRC(ih3->code)*(HZ/IGMP_TIMER_SCALE);

		if (!max_delay)

			max_delay = 1;	/* can't mod w/ 0 */

	} else { /* v3 */

		if (!pskb_may_pull(skb, sizeof(struct igmpv3_query)))

			return;