net: bridge: mcast: improve IGMPv3/MLDv2 query processing

When an IGMPv3/MLDv2 query is received and we're operating in such mode
then we need to avoid updating group timers if the suppress flag is set.
Also we should update only timers for groups in exclude mode.

v3: add IPv6/MLDv2 support

Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 6cfac6cbaf3b991bab12ae049a864bc1e547f759..0bf791ed0f5698847afffa1af7d6485e3f254c5b 100644 (file)
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -2194,7 +2194,8 @@ static void br_ip4_multicast_query(struct net_bridge *br,
                }
        } else if (transport_len >= sizeof(*ih3)) {
                ih3 = igmpv3_query_hdr(skb);
-               if (ih3->nsrcs)
+               if (ih3->nsrcs ||
+                   (br->multicast_igmp_version == 3 && group && ih3->suppress))
                        goto out;
 
                max_delay = ih3->code ?
@@ -2229,7 +2230,9 @@ static void br_ip4_multicast_query(struct net_bridge *br,
             pp = &p->next) {
                if (timer_pending(&p->timer) ?
                    time_after(p->timer.expires, now + max_delay) :
-                   try_to_del_timer_sync(&p->timer) >= 0)
+                   try_to_del_timer_sync(&p->timer) >= 0 &&
+                   (br->multicast_igmp_version == 2 ||
+                    p->filter_mode == MCAST_EXCLUDE))
                        mod_timer(&p->timer, now + max_delay);
        }
 
@@ -2279,6 +2282,10 @@ static int br_ip6_multicast_query(struct net_bridge *br,
                mld2q = (struct mld2_query *)icmp6_hdr(skb);
                if (!mld2q->mld2q_nsrcs)
                        group = &mld2q->mld2q_mca;
+               if (br->multicast_mld_version == 2 &&
+                   !ipv6_addr_any(&mld2q->mld2q_mca) &&
+                   mld2q->mld2q_suppress)
+                       goto out;
 
                max_delay = max(msecs_to_jiffies(mldv2_mrc(mld2q)), 1UL);
        }
@@ -2312,7 +2319,9 @@ static int br_ip6_multicast_query(struct net_bridge *br,
             pp = &p->next) {
                if (timer_pending(&p->timer) ?
                    time_after(p->timer.expires, now + max_delay) :
-                   try_to_del_timer_sync(&p->timer) >= 0)
+                   try_to_del_timer_sync(&p->timer) >= 0 &&
+                   (br->multicast_mld_version == 1 ||
+                    p->filter_mode == MCAST_EXCLUDE))
                        mod_timer(&p->timer, now + max_delay);
        }