diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2012-01-09 14:06:46 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-09 14:06:46 -0800 |
| commit | a8c1f65c79cbbb2f7da782d4c9d15639a9b94b27 (patch) | |
| tree | 8e1ac7654905142f37d74d8e3e376325a5eb48b1 /net/ipv4/igmp.c | |
| parent | e5686ad82ca2aeed7a8f24ffca115c0b7478dec9 (diff) | |
| download | lwn-a8c1f65c79cbbb2f7da782d4c9d15639a9b94b27.tar.gz lwn-a8c1f65c79cbbb2f7da782d4c9d15639a9b94b27.zip | |
igmp: Avoid zero delay when receiving odd mixture of IGMP queries
Commit 5b7c84066733c5dfb0e4016d939757b38de189e4 ('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: Simon McVittie <smcv@debian.org>
References: http://bugs.debian.org/654876
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/igmp.c')
| -rw-r--r-- | net/ipv4/igmp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index fa057d105bef..5104bc0bbdbe 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c @@ -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; |