--- zzzz-none-000/linux-3.10.107/net/bridge/br_multicast.c 2017-06-27 09:49:32.000000000 +0000 +++ vr9-7490-729/linux-3.10.107/net/bridge/br_multicast.c 2021-11-10 11:53:56.000000000 +0000 @@ -23,16 +23,26 @@ #include #include #include +#include #include #if IS_ENABLED(CONFIG_IPV6) #include #include #include +#include #endif #include "br_private.h" -static void br_multicast_start_querier(struct net_bridge *br); +#ifdef CONFIG_AVM_PA +#include +#endif + +/*--- #define DBG_TRC(args...) printk(KERN_INFO args) ---*/ +#define DBG_TRC(args...) + +static void br_multicast_start_querier(struct net_bridge *br, + struct bridge_mcast_own_query *query); unsigned int br_mdb_rehash_seq; static inline int br_ip_equal(const struct br_ip *a, const struct br_ip *b) @@ -58,6 +68,12 @@ return jhash_2words((__force u32)ip, vid, mdb->secret) & (mdb->max - 1); } + +static void br_ip4_multicast_leave_group(struct net_bridge *br, + struct net_bridge_port *port, + const struct ethhdr *eth, + __be32 group, __u16 vid); + #if IS_ENABLED(CONFIG_IPV6) static inline int __br_ip6_hash(struct net_bridge_mdb_htable *mdb, const struct in6_addr *ip, @@ -66,6 +82,12 @@ return jhash_2words(ipv6_addr_hash(ip), vid, mdb->secret) & (mdb->max - 1); } + + +static void br_ip6_multicast_leave_group(struct net_bridge *br, + struct net_bridge_port *port, + const struct ethhdr *eth, + const struct in6_addr *group, __u16 vid); #endif static inline int br_ip_hash(struct net_bridge_mdb_htable *mdb, @@ -202,14 +224,50 @@ return maxlen > elasticity ? -EINVAL : 0; } -void br_multicast_free_pg(struct rcu_head *head) +static void free_recipients(struct net_bridge_port_group *p) +{ +#ifdef CONFIG_AVM_BRIDGE_MULTICAST_TO_UNICAST + struct list_head *this, *next; + struct net_bridge_group_recipient *recp; + + for (this = p->free_start; next = this->next, this != &p->recipients; this = next) { + recp = container_of(this, struct net_bridge_group_recipient, list); + kfree(recp); + } +#endif +} + +static void br_multicast_free_pg(struct rcu_head *head) { struct net_bridge_port_group *p = container_of(head, struct net_bridge_port_group, rcu); + free_recipients(p); kfree(p); } +void delete_recipients(struct net_bridge_port_group *p) +{ +#ifdef CONFIG_AVM_BRIDGE_MULTICAST_TO_UNICAST + struct net_bridge_group_recipient *pos; + list_for_each_entry(pos, &p->recipients, list) { + hlist_del(&pos->fdb_list); + } + /* this works even if recipients is empty, free_recipients() can catch this */ + p->free_start = p->recipients.next; + INIT_LIST_HEAD_RCU(&p->recipients); +#endif +} + +/* must be called under the bridge's multicast lock */ +void br_multicast_delete_pg(struct net_bridge_port_group *p) +{ + hlist_del_init(&p->mglist); + del_timer(&p->timer); + delete_recipients(p); + call_rcu_bh(&p->rcu, br_multicast_free_pg); +} + static void br_multicast_free_group(struct rcu_head *head) { struct net_bridge_mdb_entry *mp = @@ -237,7 +295,6 @@ hlist_del_rcu(&mp->hlist[mdb->ver]); mdb->size--; - call_rcu_bh(&mp->rcu, br_multicast_free_group); out: @@ -265,14 +322,18 @@ continue; rcu_assign_pointer(*pp, p->next); - hlist_del_init(&p->mglist); - del_timer(&p->timer); - call_rcu_bh(&p->rcu, br_multicast_free_pg); + br_multicast_delete_pg(p); if (!mp->ports && !mp->mglist && netif_running(br->dev)) mod_timer(&mp->timer, jiffies); +#ifdef CONFIG_AVM_PA + /* Must re-learn multicast sessions because of removed port group, + * otherwise avm_pa continues to forward to that port */ + if (mp->addr.proto == htons(ETH_P_IP)) + avm_pa_flush_multicast_sessions_for_group(mp->addr.u.ip4); +#endif return; } @@ -360,7 +421,7 @@ skb_reset_mac_header(skb); eth = eth_hdr(skb); - memcpy(eth->h_source, br->dev->dev_addr, 6); + ether_addr_copy(eth->h_source, br->dev->dev_addr); eth->h_dest[0] = 1; eth->h_dest[1] = 0; eth->h_dest[2] = 0x5e; @@ -381,7 +442,8 @@ iph->frag_off = htons(IP_DF); iph->ttl = 1; iph->protocol = IPPROTO_IGMP; - iph->saddr = 0; + iph->saddr = br->multicast_query_use_ifaddr ? + inet_select_addr(br->dev, 0, RT_SCOPE_LINK) : 0; iph->daddr = htonl(INADDR_ALLHOSTS_GROUP); ((u8 *)&iph[1])[0] = IPOPT_RA; ((u8 *)&iph[1])[1] = 4; @@ -429,7 +491,7 @@ skb_reset_mac_header(skb); eth = eth_hdr(skb); - memcpy(eth->h_source, br->dev->dev_addr, 6); + ether_addr_copy(eth->h_source, br->dev->dev_addr); eth->h_proto = htons(ETH_P_IPV6); skb_put(skb, sizeof(*eth)); @@ -643,14 +705,105 @@ p->state = state; rcu_assign_pointer(p->next, next); hlist_add_head(&p->mglist, &port->mglist); +#ifdef CONFIG_AVM_BRIDGE_MULTICAST_TO_UNICAST + INIT_LIST_HEAD(&p->recipients); +#endif setup_timer(&p->timer, br_multicast_port_group_expired, (unsigned long)p); return p; } + +#ifdef CONFIG_AVM_BRIDGE_MULTICAST_TO_UNICAST +/* must be called under the bridge's multicast lock */ +static int add_group_recipient(struct net_bridge *br, + struct net_bridge_port_group *group, + const struct ethhdr *eth) +{ + struct net_bridge_group_recipient *p, *recp; + struct net_bridge_fdb_entry *fdb; + + /* Find the fdb entry that corresponds to the source address. + * Lookup could fail if the port is not in LEARNING state. + */ + fdb = __br_fdb_get(br, eth->h_source, group->addr.vid); + if (!fdb) + return -ENODEV; + + /* never add twice */ + list_for_each_entry(p, &group->recipients, list) { + if (fdb == rcu_dereference(p->recipient)) + return 0; + } + + recp = kzalloc(sizeof(*recp), GFP_ATOMIC); + if (unlikely(!recp)) + return -ENOMEM; + + recp->recipient = fdb; + recp->group = group; + recp->group->num_recipients++; + list_add_rcu(&recp->list, &recp->group->recipients); + /* To be able to remove this fdb from the recipents when it's freed the fdb + * has a list of all net_bridge_group_recipient it is part of */ + hlist_add_head(&recp->fdb_list, &fdb->pg_list); + if (group->addr.proto == ETH_P_IPV6) + DBG_TRC("Added %pM recipient for mc group %pI6 (vid: %d), now %d recipients", eth->h_source, &group->addr.u.ip6, group->addr.vid, group->num_recipients); + else + DBG_TRC("Added %pM recipient for mc group %pI4 (vid: %d), now %d recipients", eth->h_source, &group->addr.u.ip4, group->addr.vid, group->num_recipients); + return 0; +} + + +static void br_multicast_free_recipient(struct rcu_head *head) +{ + struct net_bridge_group_recipient *recp = + container_of(head, struct net_bridge_group_recipient, rcu); + + kfree(recp); +} + +/* Deletes the recipient from all lists and schedules the rcu callback to free it. + * must be called under the bridge's multicast lock */ +void br_multicast_delete_recipient(struct net_bridge_group_recipient *p) +{ + BUG_ON(p->group->num_recipients == 0); + + hlist_del(&p->fdb_list); + list_del_rcu(&p->list); + p->group->num_recipients--; + call_rcu_bh(&p->rcu, &br_multicast_free_recipient); +} + +/* must be called under the bridge's multicast lock */ +static int del_group_recipient(struct net_bridge *br, + struct net_bridge_port_group *group, + const struct ethhdr *eth) +{ + struct net_bridge_group_recipient *p, *temp; + struct net_bridge_fdb_entry *fdb; + + /* find the fdb entry that corresponds to the source address */ + fdb = __br_fdb_get(br, eth->h_source, group->addr.vid); + BUG_ON(fdb == NULL); + + list_for_each_entry_safe(p, temp, &group->recipients, list) { + if (fdb == p->recipient) { + br_multicast_delete_recipient(p); + if (group->addr.proto == ETH_P_IPV6) + DBG_TRC("Removed %pM recipient for mc group %pI6 (vid: %d), now %d recipients\n", eth->h_source, &group->addr.u.ip6, group->addr.vid, group->num_recipients); + else + DBG_TRC("Removed %pM recipient for mc group %pI4 (vid: %d), now %d recipients\n", eth->h_source, &group->addr.u.ip4, group->addr.vid, group->num_recipients); + } + } + return 0; +} +#endif + static int br_multicast_add_group(struct net_bridge *br, struct net_bridge_port *port, - struct br_ip *group) + struct br_ip *group, + const struct ethhdr *eth) { struct net_bridge_mdb_entry *mp; struct net_bridge_port_group *p; @@ -690,6 +843,16 @@ br_mdb_notify(br->dev, port, group, RTM_NEWMDB); found: +#ifdef CONFIG_AVM_PA + /* Must re-learn multicast sessions because of newly added port group, + * otherwise avm_pa continues to forward only to existing egress ports and + * not this one */ + if (p->addr.proto == htons(ETH_P_IP)) + avm_pa_flush_multicast_sessions_for_group(mp->addr.u.ip4); +#endif +#ifdef CONFIG_AVM_BRIDGE_MULTICAST_TO_UNICAST + add_group_recipient(br, p, eth); +#endif mod_timer(&p->timer, now + br->multicast_membership_interval); out: err = 0; @@ -702,6 +865,7 @@ static int br_ip4_multicast_add_group(struct net_bridge *br, struct net_bridge_port *port, __be32 group, + const struct ethhdr *eth, __u16 vid) { struct br_ip br_group; @@ -713,25 +877,26 @@ br_group.proto = htons(ETH_P_IP); br_group.vid = vid; - return br_multicast_add_group(br, port, &br_group); + return br_multicast_add_group(br, port, &br_group, eth); } #if IS_ENABLED(CONFIG_IPV6) static int br_ip6_multicast_add_group(struct net_bridge *br, struct net_bridge_port *port, const struct in6_addr *group, + const struct ethhdr *eth, __u16 vid) { struct br_ip br_group; - if (!ipv6_is_transient_multicast(group)) + if (ipv6_addr_is_ll_all_nodes(group)) return 0; br_group.u.ip6 = *group; br_group.proto = htons(ETH_P_IPV6); br_group.vid = vid; - return br_multicast_add_group(br, port, &br_group); + return br_multicast_add_group(br, port, &br_group, eth); } #endif @@ -756,20 +921,47 @@ { } -static void br_multicast_querier_expired(unsigned long data) +static void br_multicast_querier_expired(struct net_bridge *br, + struct bridge_mcast_own_query *query) { - struct net_bridge *br = (void *)data; - spin_lock(&br->multicast_lock); if (!netif_running(br->dev) || br->multicast_disabled) goto out; - br_multicast_start_querier(br); + br_multicast_start_querier(br, query); out: spin_unlock(&br->multicast_lock); } +static void br_ip4_multicast_querier_expired(unsigned long data) +{ + struct net_bridge *br = (void *)data; + + br_multicast_querier_expired(br, &br->ip4_own_query); +} + +#if IS_ENABLED(CONFIG_IPV6) +static void br_ip6_multicast_querier_expired(unsigned long data) +{ + struct net_bridge *br = (void *)data; + + br_multicast_querier_expired(br, &br->ip6_own_query); +} +#endif + +static void br_multicast_select_own_querier(struct net_bridge *br, + struct br_ip *ip, + struct sk_buff *skb) +{ + if (ip->proto == htons(ETH_P_IP)) + br->ip4_querier.addr.u.ip4 = ip_hdr(skb)->saddr; +#if IS_ENABLED(CONFIG_IPV6) + else + br->ip6_querier.addr.u.ip6 = ipv6_hdr(skb)->saddr; +#endif +} + static void __br_multicast_send_query(struct net_bridge *br, struct net_bridge_port *port, struct br_ip *ip) @@ -785,42 +977,53 @@ skb->dev = port->dev; NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev, dev_queue_xmit); - } else + } else { + br_multicast_select_own_querier(br, ip, skb); netif_rx(skb); + } } static void br_multicast_send_query(struct net_bridge *br, - struct net_bridge_port *port, u32 sent) + struct net_bridge_port *port, + struct bridge_mcast_own_query *own_query) { unsigned long time; struct br_ip br_group; + struct bridge_mcast_other_query *other_query = NULL; if (!netif_running(br->dev) || br->multicast_disabled || - !br->multicast_querier || - timer_pending(&br->multicast_querier_timer)) + !br->multicast_querier) return; memset(&br_group.u, 0, sizeof(br_group.u)); - br_group.proto = htons(ETH_P_IP); - __br_multicast_send_query(br, port, &br_group); - + if (port ? (own_query == &port->ip4_own_query) : + (own_query == &br->ip4_own_query)) { + other_query = &br->ip4_other_query; + br_group.proto = htons(ETH_P_IP); #if IS_ENABLED(CONFIG_IPV6) - br_group.proto = htons(ETH_P_IPV6); - __br_multicast_send_query(br, port, &br_group); + } else { + other_query = &br->ip6_other_query; + br_group.proto = htons(ETH_P_IPV6); #endif + } + + if (!other_query || timer_pending(&other_query->timer)) + return; + + __br_multicast_send_query(br, port, &br_group); time = jiffies; - time += sent < br->multicast_startup_query_count ? + time += own_query->startup_sent < br->multicast_startup_query_count ? br->multicast_startup_query_interval : br->multicast_query_interval; - mod_timer(port ? &port->multicast_query_timer : - &br->multicast_query_timer, time); + mod_timer(&own_query->timer, time); } -static void br_multicast_port_query_expired(unsigned long data) +static void +br_multicast_port_query_expired(struct net_bridge_port *port, + struct bridge_mcast_own_query *query) { - struct net_bridge_port *port = (void *)data; struct net_bridge *br = port->br; spin_lock(&br->multicast_lock); @@ -828,25 +1031,47 @@ port->state == BR_STATE_BLOCKING) goto out; - if (port->multicast_startup_queries_sent < - br->multicast_startup_query_count) - port->multicast_startup_queries_sent++; + if (query->startup_sent < br->multicast_startup_query_count) + query->startup_sent++; - br_multicast_send_query(port->br, port, - port->multicast_startup_queries_sent); + br_multicast_send_query(port->br, port, query); out: spin_unlock(&br->multicast_lock); } +static void br_ip4_multicast_port_query_expired(unsigned long data) +{ + struct net_bridge_port *port = (void *)data; + + br_multicast_port_query_expired(port, &port->ip4_own_query); +} + +#if IS_ENABLED(CONFIG_IPV6) +static void br_ip6_multicast_port_query_expired(unsigned long data) +{ + struct net_bridge_port *port = (void *)data; + + br_multicast_port_query_expired(port, &port->ip6_own_query); +} +#endif + void br_multicast_add_port(struct net_bridge_port *port) { +#ifdef CONFIG_AVM_BRIDGE_MULTICAST_TO_UNICAST + port->multicast_to_unicast_threshold = + CONFIG_AVM_BRIDGE_MULTICAST_TO_UNICAST_DEFAULT_THRESHOLD; +#endif port->multicast_router = 1; setup_timer(&port->multicast_router_timer, br_multicast_router_expired, (unsigned long)port); - setup_timer(&port->multicast_query_timer, - br_multicast_port_query_expired, (unsigned long)port); + setup_timer(&port->ip4_own_query.timer, + br_ip4_multicast_port_query_expired, (unsigned long)port); +#if IS_ENABLED(CONFIG_IPV6) + setup_timer(&port->ip6_own_query.timer, + br_ip6_multicast_port_query_expired, (unsigned long)port); +#endif } void br_multicast_del_port(struct net_bridge_port *port) @@ -854,13 +1079,13 @@ del_timer_sync(&port->multicast_router_timer); } -static void __br_multicast_enable_port(struct net_bridge_port *port) +static void br_multicast_enable(struct bridge_mcast_own_query *query) { - port->multicast_startup_queries_sent = 0; + query->startup_sent = 0; - if (try_to_del_timer_sync(&port->multicast_query_timer) >= 0 || - del_timer(&port->multicast_query_timer)) - mod_timer(&port->multicast_query_timer, jiffies); + if (try_to_del_timer_sync(&query->timer) >= 0 || + del_timer(&query->timer)) + mod_timer(&query->timer, jiffies); } void br_multicast_enable_port(struct net_bridge_port *port) @@ -871,7 +1096,10 @@ if (br->multicast_disabled || !netif_running(br->dev)) goto out; - __br_multicast_enable_port(port); + br_multicast_enable(&port->ip4_own_query); +#if IS_ENABLED(CONFIG_IPV6) + br_multicast_enable(&port->ip6_own_query); +#endif out: spin_unlock(&br->multicast_lock); @@ -890,13 +1118,18 @@ if (!hlist_unhashed(&port->rlist)) hlist_del_init_rcu(&port->rlist); del_timer(&port->multicast_router_timer); - del_timer(&port->multicast_query_timer); + del_timer(&port->ip4_own_query.timer); +#if IS_ENABLED(CONFIG_IPV6) + del_timer(&port->ip6_own_query.timer); +#endif spin_unlock(&br->multicast_lock); } static int br_ip4_multicast_igmp3_report(struct net_bridge *br, struct net_bridge_port *port, - struct sk_buff *skb) + struct sk_buff *skb, + const struct ethhdr *eth, + u16 vid) { struct igmpv3_report *ih; struct igmpv3_grec *grec; @@ -904,14 +1137,13 @@ int len; int num; int type; + short nsrcs; int err = 0; __be32 group; - u16 vid = 0; if (!pskb_may_pull(skb, sizeof(*ih))) return -EINVAL; - br_vlan_get_tag(skb, &vid); ih = igmpv3_report_hdr(skb); num = ntohs(ih->ngrec); len = sizeof(*ih); @@ -924,16 +1156,23 @@ grec = (void *)(skb->data + len - sizeof(*grec)); group = grec->grec_mca; type = grec->grec_type; + nsrcs = ntohs(grec->grec_nsrcs); - len += ntohs(grec->grec_nsrcs) * 4; + len += nsrcs * 4; if (!pskb_may_pull(skb, len)) return -EINVAL; - /* We treat this as an IGMPv2 report for now. */ + /* AVM: We treat this as an IGMPv2 message for now. _INCLUDE is with zero + * sources is eqivalent to an IGMPv2 leave message. On the other hand, + * if there are any sources included, this should be treated as join/report */ switch (type) { case IGMPV3_MODE_IS_INCLUDE: - case IGMPV3_MODE_IS_EXCLUDE: case IGMPV3_CHANGE_TO_INCLUDE: + if (nsrcs == 0) { + br_ip4_multicast_leave_group(br, port, eth, group, vid); + continue; + } + case IGMPV3_MODE_IS_EXCLUDE: case IGMPV3_CHANGE_TO_EXCLUDE: case IGMPV3_ALLOW_NEW_SOURCES: case IGMPV3_BLOCK_OLD_SOURCES: @@ -943,7 +1182,7 @@ continue; } - err = br_ip4_multicast_add_group(br, port, group, vid); + err = br_ip4_multicast_add_group(br, port, group, eth, vid); if (err) break; } @@ -954,7 +1193,9 @@ #if IS_ENABLED(CONFIG_IPV6) static int br_ip6_multicast_mld2_report(struct net_bridge *br, struct net_bridge_port *port, - struct sk_buff *skb) + struct sk_buff *skb, + const struct ethhdr *eth, + u16 vid) { struct icmp6hdr *icmp6h; struct mld2_grec *grec; @@ -962,12 +1203,10 @@ int len; int num; int err = 0; - u16 vid = 0; if (!pskb_may_pull(skb, sizeof(*icmp6h))) return -EINVAL; - br_vlan_get_tag(skb, &vid); icmp6h = icmp6_hdr(skb); num = ntohs(icmp6h->icmp6_dataun.un_data16[1]); len = sizeof(*icmp6h); @@ -991,11 +1230,17 @@ len += sizeof(*grec) + sizeof(struct in6_addr) * ntohs(*nsrcs); - /* We treat these as MLDv1 reports for now. */ + /* AVM: We treat this as an MLDv1 message for now. _INCLUDE is with zero + * sources is eqivalent to an MLDv1 leave message. On the other hand, + * if there are any sources included, this should be treated as join/report */ switch (grec->grec_type) { case MLD2_MODE_IS_INCLUDE: - case MLD2_MODE_IS_EXCLUDE: case MLD2_CHANGE_TO_INCLUDE: + if ((*nsrcs) == 0) { + br_ip6_multicast_leave_group(br, port, eth, &grec->grec_mca, vid); + continue; + } + case MLD2_MODE_IS_EXCLUDE: case MLD2_CHANGE_TO_EXCLUDE: case MLD2_ALLOW_NEW_SOURCES: case MLD2_BLOCK_OLD_SOURCES: @@ -1006,7 +1251,7 @@ } err = br_ip6_multicast_add_group(br, port, &grec->grec_mca, - vid); + eth, vid); if (err) break; } @@ -1015,8 +1260,75 @@ } #endif +static bool br_ip4_multicast_select_querier(struct net_bridge *br, + __be32 saddr) +{ + if (!timer_pending(&br->ip4_own_query.timer) && + !timer_pending(&br->ip4_other_query.timer)) + goto update; + + if (!br->ip4_querier.addr.u.ip4) + goto update; + + if (ntohl(saddr) <= ntohl(br->ip4_querier.addr.u.ip4)) + goto update; + + return false; + +update: + br->ip4_querier.addr.u.ip4 = saddr; + + return true; +} + +#if IS_ENABLED(CONFIG_IPV6) +static bool br_ip6_multicast_select_querier(struct net_bridge *br, + struct in6_addr *saddr) +{ + if (!timer_pending(&br->ip6_own_query.timer) && + !timer_pending(&br->ip6_other_query.timer)) + goto update; + + if (ipv6_addr_cmp(saddr, &br->ip6_querier.addr.u.ip6) <= 0) + goto update; + + return false; + +update: + br->ip6_querier.addr.u.ip6 = *saddr; + + return true; +} +#endif + +static bool br_multicast_select_querier(struct net_bridge *br, + struct br_ip *saddr) +{ + switch (saddr->proto) { + case htons(ETH_P_IP): + return br_ip4_multicast_select_querier(br, saddr->u.ip4); +#if IS_ENABLED(CONFIG_IPV6) + case htons(ETH_P_IPV6): + return br_ip6_multicast_select_querier(br, &saddr->u.ip6); +#endif + } + + return false; +} + +static void +br_multicast_update_query_timer(struct net_bridge *br, + struct bridge_mcast_other_query *query, + unsigned long max_delay) +{ + if (!timer_pending(&query->timer)) + query->delay_time = jiffies + max_delay; + + mod_timer(&query->timer, jiffies + br->multicast_querier_interval); +} + /* - * Add port to rotuer_list + * Add port to router_list * list is maintained ordered by pointer value * and locked by br->multicast_lock and RCU */ @@ -1064,20 +1376,21 @@ static void br_multicast_query_received(struct net_bridge *br, struct net_bridge_port *port, - int saddr) + struct bridge_mcast_other_query *query, + struct br_ip *saddr, + unsigned long max_delay) { - if (saddr) - mod_timer(&br->multicast_querier_timer, - jiffies + br->multicast_querier_interval); - else if (timer_pending(&br->multicast_querier_timer)) + if (!br_multicast_select_querier(br, saddr)) return; + br_multicast_update_query_timer(br, query, max_delay); br_multicast_mark_router(br, port); } static int br_ip4_multicast_query(struct net_bridge *br, struct net_bridge_port *port, - struct sk_buff *skb) + struct sk_buff *skb, + u16 vid) { const struct iphdr *iph = ip_hdr(skb); struct igmphdr *ih = igmp_hdr(skb); @@ -1085,19 +1398,17 @@ struct igmpv3_query *ih3; struct net_bridge_port_group *p; struct net_bridge_port_group __rcu **pp; + struct br_ip saddr; unsigned long max_delay; unsigned long now = jiffies; __be32 group; int err = 0; - u16 vid = 0; spin_lock(&br->multicast_lock); if (!netif_running(br->dev) || (port && port->state == BR_STATE_DISABLED)) goto out; - br_multicast_query_received(br, port, !!iph->saddr); - group = ih->group; if (skb->len == sizeof(*ih)) { @@ -1121,10 +1432,23 @@ IGMPV3_MRC(ih3->code) * (HZ / IGMP_TIMER_SCALE) : 1; } - if (!group) + /* RFC2236+RFC3376 (IGMPv2+IGMPv3) require the multicast link layer + * all-systems destination addresses (224.0.0.1) for general queries + */ + if (!group && iph->daddr != htonl(INADDR_ALLHOSTS_GROUP)) { + err = -EINVAL; + goto out; + } + + if (!group) { + saddr.proto = htons(ETH_P_IP); + saddr.u.ip4 = iph->saddr; + + br_multicast_query_received(br, port, &br->ip4_other_query, + &saddr, max_delay); goto out; + } - br_vlan_get_tag(skb, &vid); mp = br_mdb_ip4_get(mlock_dereference(br->mdb, br), group, vid); if (!mp) goto out; @@ -1154,7 +1478,8 @@ #if IS_ENABLED(CONFIG_IPV6) static int br_ip6_multicast_query(struct net_bridge *br, struct net_bridge_port *port, - struct sk_buff *skb) + struct sk_buff *skb, + u16 vid) { const struct ipv6hdr *ip6h = ipv6_hdr(skb); struct mld_msg *mld; @@ -1162,18 +1487,23 @@ struct mld2_query *mld2q; struct net_bridge_port_group *p; struct net_bridge_port_group __rcu **pp; + struct br_ip saddr; unsigned long max_delay; unsigned long now = jiffies; const struct in6_addr *group = NULL; + bool is_general_query; int err = 0; - u16 vid = 0; spin_lock(&br->multicast_lock); if (!netif_running(br->dev) || (port && port->state == BR_STATE_DISABLED)) goto out; - br_multicast_query_received(br, port, !ipv6_addr_any(&ip6h->saddr)); + /* RFC2710+RFC3810 (MLDv1+MLDv2) require link-local source addresses */ + if (!(ipv6_addr_type(&ip6h->saddr) & IPV6_ADDR_LINKLOCAL)) { + err = -EINVAL; + goto out; + } /* RFC2710+RFC3810 (MLDv1+MLDv2) require link-local source addresses */ if (!(ipv6_addr_type(&ip6h->saddr) & IPV6_ADDR_LINKLOCAL)) { @@ -1199,13 +1529,30 @@ if (!mld2q->mld2q_nsrcs) group = &mld2q->mld2q_mca; - max_delay = max(msecs_to_jiffies(MLDV2_MRC(ntohs(mld2q->mld2q_mrc))), 1UL); + max_delay = max(msecs_to_jiffies(mldv2_mrc(mld2q)), 1UL); + } + + is_general_query = group && ipv6_addr_any(group); + + /* RFC2710+RFC3810 (MLDv1+MLDv2) require the multicast link layer + * all-nodes destination address (ff02::1) for general queries + */ + if (is_general_query && !ipv6_addr_is_ll_all_nodes(&ip6h->daddr)) { + err = -EINVAL; + goto out; } - if (!group) + if (is_general_query) { + saddr.proto = htons(ETH_P_IPV6); + saddr.u.ip6 = ip6h->saddr; + + br_multicast_query_received(br, port, &br->ip6_other_query, + &saddr, max_delay); + goto out; + } else if (!group) { goto out; + } - br_vlan_get_tag(skb, &vid); mp = br_mdb_ip6_get(mlock_dereference(br->mdb, br), group, vid); if (!mp) goto out; @@ -1234,7 +1581,10 @@ static void br_multicast_leave_group(struct net_bridge *br, struct net_bridge_port *port, - struct br_ip *group) + const struct ethhdr *eth, + struct br_ip *group, + struct bridge_mcast_other_query *other_query, + struct bridge_mcast_own_query *own_query) { struct net_bridge_mdb_htable *mdb; struct net_bridge_mdb_entry *mp; @@ -1245,7 +1595,7 @@ spin_lock(&br->multicast_lock); if (!netif_running(br->dev) || (port && port->state == BR_STATE_DISABLED) || - timer_pending(&br->multicast_querier_timer)) + timer_pending(&other_query->timer)) goto out; mdb = mlock_dereference(br->mdb, br); @@ -1253,6 +1603,31 @@ if (!mp) goto out; + if (br->multicast_querier) { + __br_multicast_send_query(br, port, &mp->addr); + + time = jiffies + br->multicast_last_member_count * + br->multicast_last_member_interval; + + mod_timer(&own_query->timer, time); + + for (p = mlock_dereference(mp->ports, br); + p != NULL; + p = mlock_dereference(p->next, br)) { + if (p->port != port) + continue; + + if (!hlist_unhashed(&p->mglist) && + (timer_pending(&p->timer) ? + time_after(p->timer.expires, time) : + try_to_del_timer_sync(&p->timer) >= 0)) { + mod_timer(&p->timer, time); + } + + break; + } + } + if (port && (port->flags & BR_MULTICAST_FAST_LEAVE)) { struct net_bridge_port_group __rcu **pp; @@ -1263,9 +1638,7 @@ continue; rcu_assign_pointer(*pp, p->next); - hlist_del_init(&p->mglist); - del_timer(&p->timer); - call_rcu_bh(&p->rcu, br_multicast_free_pg); + br_multicast_delete_pg(p); br_mdb_notify(br->dev, port, group, RTM_DELMDB); if (!mp->ports && !mp->mglist && @@ -1296,6 +1669,10 @@ if (p->port != port) continue; +#ifdef CONFIG_AVM_BRIDGE_MULTICAST_TO_UNICAST + del_group_recipient(br, p, eth); +#endif + if (!hlist_unhashed(&p->mglist) && (timer_pending(&p->timer) ? time_after(p->timer.expires, time) : @@ -1305,63 +1682,75 @@ break; } - out: spin_unlock(&br->multicast_lock); } static void br_ip4_multicast_leave_group(struct net_bridge *br, struct net_bridge_port *port, + const struct ethhdr *eth, __be32 group, __u16 vid) { struct br_ip br_group; + struct bridge_mcast_own_query *own_query; if (ipv4_is_local_multicast(group)) return; + own_query = port ? &port->ip4_own_query : &br->ip4_own_query; + br_group.u.ip4 = group; br_group.proto = htons(ETH_P_IP); br_group.vid = vid; - br_multicast_leave_group(br, port, &br_group); + br_multicast_leave_group(br, port, eth, &br_group, &br->ip4_other_query, + own_query); } #if IS_ENABLED(CONFIG_IPV6) static void br_ip6_multicast_leave_group(struct net_bridge *br, struct net_bridge_port *port, + const struct ethhdr *eth, const struct in6_addr *group, __u16 vid) { struct br_ip br_group; + struct bridge_mcast_own_query *own_query; - if (!ipv6_is_transient_multicast(group)) + if (ipv6_addr_is_ll_all_nodes(group)) return; + own_query = port ? &port->ip6_own_query : &br->ip6_own_query; + br_group.u.ip6 = *group; br_group.proto = htons(ETH_P_IPV6); br_group.vid = vid; - br_multicast_leave_group(br, port, &br_group); + br_multicast_leave_group(br, port, eth, &br_group, &br->ip6_other_query, + own_query); } #endif static int br_multicast_ipv4_rcv(struct net_bridge *br, struct net_bridge_port *port, - struct sk_buff *skb) + struct sk_buff *skb, + u16 vid) { struct sk_buff *skb2 = skb; - const struct iphdr *iph; + struct iphdr *iph; + const struct ethhdr *eth; struct igmphdr *ih; unsigned int len; unsigned int offset; int err; - u16 vid = 0; /* We treat OOM as packet loss for now. */ if (!pskb_may_pull(skb, sizeof(*iph))) return -EINVAL; + eth = eth_hdr(skb); + iph = ip_hdr(skb); if (iph->ihl < 5 || iph->version != 4) @@ -1372,8 +1761,18 @@ iph = ip_hdr(skb); - if (unlikely(ip_fast_csum((u8 *)iph, iph->ihl))) - return -EINVAL; + if (unlikely(ip_fast_csum((u8 *)iph, iph->ihl))) { + /* Dear Apple, Inc. + * Please fix those stupid iPads sending IGMP packets with bad ip + * checksum. The checksum appears to be only calculated across the first + * 20 bytes (without RA option). As of this writing, this applies to + * iOS 9.1. We have this workaround but we'd feel better without. + * TMA 2015/11/25 */ + if (iph->ihl > 5 && iph->protocol == IPPROTO_IGMP && ip_fast_csum((u8 *)iph, 5) == 0) + ip_send_check(iph); + else + return -EINVAL; + } if (iph->protocol != IPPROTO_IGMP) { if (!ipv4_is_local_multicast(iph->daddr)) @@ -1395,7 +1794,6 @@ goto err_out; } - len -= ip_hdrlen(skb2); offset = skb_network_offset(skb2) + ip_hdrlen(skb2); __skb_pull(skb2, offset); skb_reset_transport_header(skb2); @@ -1417,7 +1815,6 @@ err = 0; - br_vlan_get_tag(skb2, &vid); BR_INPUT_SKB_CB(skb)->igmp = 1; ih = igmp_hdr(skb2); @@ -1425,16 +1822,16 @@ case IGMP_HOST_MEMBERSHIP_REPORT: case IGMPV2_HOST_MEMBERSHIP_REPORT: BR_INPUT_SKB_CB(skb)->mrouters_only = 1; - err = br_ip4_multicast_add_group(br, port, ih->group, vid); + err = br_ip4_multicast_add_group(br, port, ih->group, eth, vid); break; case IGMPV3_HOST_MEMBERSHIP_REPORT: - err = br_ip4_multicast_igmp3_report(br, port, skb2); + err = br_ip4_multicast_igmp3_report(br, port, skb2, eth, vid); break; case IGMP_HOST_MEMBERSHIP_QUERY: - err = br_ip4_multicast_query(br, port, skb2); + err = br_ip4_multicast_query(br, port, skb2, vid); break; case IGMP_HOST_LEAVE_MESSAGE: - br_ip4_multicast_leave_group(br, port, ih->group, vid); + br_ip4_multicast_leave_group(br, port, eth, ih->group, vid); break; } @@ -1449,21 +1846,24 @@ #if IS_ENABLED(CONFIG_IPV6) static int br_multicast_ipv6_rcv(struct net_bridge *br, struct net_bridge_port *port, - struct sk_buff *skb) + struct sk_buff *skb, + u16 vid) { struct sk_buff *skb2; const struct ipv6hdr *ip6h; + const struct ethhdr *eth; u8 icmp6_type; u8 nexthdr; __be16 frag_off; unsigned int len; int offset; int err; - u16 vid = 0; if (!pskb_may_pull(skb, sizeof(*ip6h))) return -EINVAL; + eth = eth_hdr(skb); + ip6h = ipv6_hdr(skb); /* @@ -1472,8 +1872,14 @@ * - MLD has always Router Alert hop-by-hop option * - But we do not support jumbrograms. */ - if (ip6h->version != 6 || - ip6h->nexthdr != IPPROTO_HOPOPTS || + if (ip6h->version != 6) + return 0; + + /* Prevent flooding this packet if there is no listener present */ + if (!ipv6_addr_is_ll_all_nodes(&ip6h->daddr)) + BR_INPUT_SKB_CB(skb)->mrouters_only = 1; + + if (ip6h->nexthdr != IPPROTO_HOPOPTS || ip6h->payload_len == 0) return 0; @@ -1543,7 +1949,6 @@ err = 0; - br_vlan_get_tag(skb, &vid); BR_INPUT_SKB_CB(skb)->igmp = 1; switch (icmp6_type) { @@ -1556,14 +1961,14 @@ } mld = (struct mld_msg *)skb_transport_header(skb2); BR_INPUT_SKB_CB(skb)->mrouters_only = 1; - err = br_ip6_multicast_add_group(br, port, &mld->mld_mca, vid); + err = br_ip6_multicast_add_group(br, port, &mld->mld_mca, eth, vid); break; } case ICMPV6_MLD2_REPORT: - err = br_ip6_multicast_mld2_report(br, port, skb2); + err = br_ip6_multicast_mld2_report(br, port, skb2, eth, vid); break; case ICMPV6_MGM_QUERY: - err = br_ip6_multicast_query(br, port, skb2); + err = br_ip6_multicast_query(br, port, skb2, vid); break; case ICMPV6_MGM_REDUCTION: { @@ -1573,7 +1978,7 @@ goto out; } mld = (struct mld_msg *)skb_transport_header(skb2); - br_ip6_multicast_leave_group(br, port, &mld->mld_mca, vid); + br_ip6_multicast_leave_group(br, port, eth, &mld->mld_mca, vid); } } @@ -1584,7 +1989,7 @@ #endif int br_multicast_rcv(struct net_bridge *br, struct net_bridge_port *port, - struct sk_buff *skb) + struct sk_buff *skb, u16 vid) { BR_INPUT_SKB_CB(skb)->igmp = 0; BR_INPUT_SKB_CB(skb)->mrouters_only = 0; @@ -1594,29 +1999,42 @@ switch (skb->protocol) { case htons(ETH_P_IP): - return br_multicast_ipv4_rcv(br, port, skb); + return br_multicast_ipv4_rcv(br, port, skb, vid); #if IS_ENABLED(CONFIG_IPV6) case htons(ETH_P_IPV6): - return br_multicast_ipv6_rcv(br, port, skb); + return br_multicast_ipv6_rcv(br, port, skb, vid); #endif } return 0; } -static void br_multicast_query_expired(unsigned long data) +static void br_multicast_query_expired(struct net_bridge *br, + struct bridge_mcast_own_query *query) +{ + spin_lock(&br->multicast_lock); + if (query->startup_sent < br->multicast_startup_query_count) + query->startup_sent++; + + br_multicast_send_query(br, NULL, query); + spin_unlock(&br->multicast_lock); +} + +static void br_ip4_multicast_query_expired(unsigned long data) { struct net_bridge *br = (void *)data; - spin_lock(&br->multicast_lock); - if (br->multicast_startup_queries_sent < - br->multicast_startup_query_count) - br->multicast_startup_queries_sent++; + br_multicast_query_expired(br, &br->ip4_own_query); +} - br_multicast_send_query(br, NULL, br->multicast_startup_queries_sent); +#if IS_ENABLED(CONFIG_IPV6) +static void br_ip6_multicast_query_expired(unsigned long data) +{ + struct net_bridge *br = (void *)data; - spin_unlock(&br->multicast_lock); + br_multicast_query_expired(br, &br->ip6_own_query); } +#endif void br_multicast_init(struct net_bridge *br) { @@ -1625,6 +2043,7 @@ br->multicast_router = 1; br->multicast_querier = 0; + br->multicast_query_use_ifaddr = 0; br->multicast_last_member_count = 2; br->multicast_startup_query_count = 2; @@ -1635,23 +2054,43 @@ br->multicast_querier_interval = 255 * HZ; br->multicast_membership_interval = 260 * HZ; + br->ip4_other_query.delay_time = 0; +#if IS_ENABLED(CONFIG_IPV6) + br->ip6_other_query.delay_time = 0; +#endif + spin_lock_init(&br->multicast_lock); setup_timer(&br->multicast_router_timer, br_multicast_local_router_expired, 0); - setup_timer(&br->multicast_querier_timer, - br_multicast_querier_expired, (unsigned long)br); - setup_timer(&br->multicast_query_timer, br_multicast_query_expired, + setup_timer(&br->ip4_other_query.timer, + br_ip4_multicast_querier_expired, (unsigned long)br); + setup_timer(&br->ip4_own_query.timer, br_ip4_multicast_query_expired, + (unsigned long)br); +#if IS_ENABLED(CONFIG_IPV6) + setup_timer(&br->ip6_other_query.timer, + br_ip6_multicast_querier_expired, (unsigned long)br); + setup_timer(&br->ip6_own_query.timer, br_ip6_multicast_query_expired, (unsigned long)br); +#endif } -void br_multicast_open(struct net_bridge *br) +static void __br_multicast_open(struct net_bridge *br, + struct bridge_mcast_own_query *query) { - br->multicast_startup_queries_sent = 0; + query->startup_sent = 0; if (br->multicast_disabled) return; - mod_timer(&br->multicast_query_timer, jiffies); + mod_timer(&query->timer, jiffies); +} + +void br_multicast_open(struct net_bridge *br) +{ + __br_multicast_open(br, &br->ip4_own_query); +#if IS_ENABLED(CONFIG_IPV6) + __br_multicast_open(br, &br->ip6_own_query); +#endif } void br_multicast_stop(struct net_bridge *br) @@ -1661,10 +2100,13 @@ struct hlist_node *n; u32 ver; int i; - del_timer_sync(&br->multicast_router_timer); - del_timer_sync(&br->multicast_querier_timer); - del_timer_sync(&br->multicast_query_timer); + del_timer_sync(&br->ip4_other_query.timer); + del_timer_sync(&br->ip4_own_query.timer); +#if IS_ENABLED(CONFIG_IPV6) + del_timer_sync(&br->ip6_other_query.timer); + del_timer_sync(&br->ip6_own_query.timer); +#endif spin_lock_bh(&br->multicast_lock); mdb = mlock_dereference(br->mdb, br); @@ -1673,6 +2115,10 @@ br->mdb = NULL; +#ifdef CONFIG_AVM_PA + avm_pa_flush_multicast_sessions(); +#endif + ver = mdb->ver; for (i = 0; i < mdb->max; i++) { hlist_for_each_entry_safe(mp, n, &mdb->mhash[i], @@ -1766,18 +2212,24 @@ return err; } -static void br_multicast_start_querier(struct net_bridge *br) +static void br_multicast_start_querier(struct net_bridge *br, + struct bridge_mcast_own_query *query) { struct net_bridge_port *port; - br_multicast_open(br); + __br_multicast_open(br, query); list_for_each_entry(port, &br->port_list, list) { if (port->state == BR_STATE_DISABLED || port->state == BR_STATE_BLOCKING) continue; - __br_multicast_enable_port(port); + if (query == &br->ip4_own_query) + br_multicast_enable(&port->ip4_own_query); +#if IS_ENABLED(CONFIG_IPV6) + else + br_multicast_enable(&port->ip6_own_query); +#endif } } @@ -1812,7 +2264,10 @@ goto rollback; } - br_multicast_start_querier(br); + br_multicast_start_querier(br, &br->ip4_own_query); +#if IS_ENABLED(CONFIG_IPV6) + br_multicast_start_querier(br, &br->ip6_own_query); +#endif unlock: spin_unlock_bh(&br->multicast_lock); @@ -1822,6 +2277,8 @@ int br_multicast_set_querier(struct net_bridge *br, unsigned long val) { + unsigned long max_delay; + val = !!val; spin_lock_bh(&br->multicast_lock); @@ -1829,8 +2286,22 @@ goto unlock; br->multicast_querier = val; - if (val) - br_multicast_start_querier(br); + if (!val) + goto unlock; + + max_delay = br->multicast_query_response_interval; + + if (!timer_pending(&br->ip4_other_query.timer)) + br->ip4_other_query.delay_time = jiffies + max_delay; + + br_multicast_start_querier(br, &br->ip4_own_query); + +#if IS_ENABLED(CONFIG_IPV6) + if (!timer_pending(&br->ip6_other_query.timer)) + br->ip6_other_query.delay_time = jiffies + max_delay; + + br_multicast_start_querier(br, &br->ip6_own_query); +#endif unlock: spin_unlock_bh(&br->multicast_lock);