diff options
| author | Daniel Borkmann <dborkman@redhat.com> | 2013-09-04 00:19:41 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-09-04 14:53:21 -0400 |
| commit | cc7f7ab758f66a9110c8e737c3de3e9f5fc209b5 (patch) | |
| tree | 7e47e57a77f9d0164fc085b06a2fe71bddf696e7 | |
| parent | 58c0ecfd8d9871cfa35bcdbf3e7b3ee9ca62ea67 (diff) | |
| download | kernel-common-cc7f7ab758f66a9110c8e737c3de3e9f5fc209b5.tar.gz kernel-common-cc7f7ab758f66a9110c8e737c3de3e9f5fc209b5.tar.bz2 kernel-common-cc7f7ab758f66a9110c8e737c3de3e9f5fc209b5.zip | |
net: ipv6: mld: similarly to MLDv2 have min max_delay of 1
Similarly as we do in MLDv2 queries, set a forged MLDv1 query with
0 ms mld_maxdelay to minimum timer shot time of 1 jiffies. This is
eventually done in igmp6_group_queried() anyway, so we can simplify
a check there.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv6/mcast.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index c916568d838a..beb76b7989a7 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c @@ -1040,12 +1040,9 @@ static void igmp6_group_queried(struct ifmcaddr6 *ma, unsigned long resptime) delay = ma->mca_timer.expires - jiffies; } - if (delay >= resptime) { - if (resptime) - delay = net_random() % resptime; - else - delay = 1; - } + if (delay >= resptime) + delay = net_random() % resptime; + ma->mca_timer.expires = jiffies + delay; if (!mod_timer(&ma->mca_timer, jiffies + delay)) atomic_inc(&ma->mca_refcnt); @@ -1258,12 +1255,15 @@ int igmp6_event_query(struct sk_buff *skb) return -EINVAL; if (len == MLD_V1_QUERY_LEN) { + unsigned long mldv1_md; + /* Ignore v1 queries */ if (mld_in_v2_mode_only(idev)) return 0; /* MLDv1 router present */ - max_delay = msecs_to_jiffies(ntohs(mld->mld_maxdelay)); + mldv1_md = ntohs(mld->mld_maxdelay); + max_delay = max(msecs_to_jiffies(mldv1_md), 1UL); mld_set_v1_mode(idev); |