B.A.T.M.A.N September 2020

b.a.t.m.a.n@lists.open-mesh.org

23 participants
27 discussions

[PATCH net-next 06/16] net: bridge: mcast: rename br_ip's u member to dst
by Nikolay Aleksandrov 21 Sep '20

21 Sep '20

From: Nikolay Aleksandrov <nikolay(a)nvidia.com> Since now we have src in br_ip, u no longer makes sense so rename it to dst. No functional changes. CC: Marek Lindner <mareklindner(a)neomailbox.ch> CC: Simon Wunderlich <sw(a)simonwunderlich.de> CC: Antonio Quartulli <a(a)unstable.cc CC: Sven Eckelmann <sven(a)narfation.org> CC: b.a.t.m.a.n(a)lists.open-mesh.org Signed-off-by: Nikolay Aleksandrov <nikolay(a)nvidia.com> --- include/linux/if_bridge.h | 2 +- net/batman-adv/multicast.c | 10 +++++----- net/bridge/br_mdb.c | 16 ++++++++-------- net/bridge/br_multicast.c | 26 +++++++++++++------------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h index 4fb9c4954f3a..556caed00258 100644 --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h @@ -25,7 +25,7 @@ struct br_ip { #if IS_ENABLED(CONFIG_IPV6) struct in6_addr ip6; #endif - } u; + } dst; __be16 proto; __u16 vid; }; diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 1622c3f5898f..2317c0d69b58 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -220,7 +220,7 @@ static u8 batadv_mcast_mla_rtr_flags_bridge_get(struct batadv_priv *bat_priv, * address here, only IPv6 ones */ if (br_ip_entry->addr.proto == htons(ETH_P_IPV6) && - ipv6_addr_is_ll_all_routers(&br_ip_entry->addr.u.ip6)) + ipv6_addr_is_ll_all_routers(&br_ip_entry->addr.dst.ip6)) flags &= ~BATADV_MCAST_WANT_NO_RTR6; list_del(&br_ip_entry->list); @@ -608,11 +608,11 @@ static int batadv_mcast_mla_bridge_get(struct net_device *dev, continue; if (tvlv_flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES && - ipv4_is_local_multicast(br_ip_entry->addr.u.ip4)) + ipv4_is_local_multicast(br_ip_entry->addr.dst.ip4)) continue; if (!(tvlv_flags & BATADV_MCAST_WANT_NO_RTR4) && - !ipv4_is_local_multicast(br_ip_entry->addr.u.ip4)) + !ipv4_is_local_multicast(br_ip_entry->addr.dst.ip4)) continue; } @@ -622,11 +622,11 @@ static int batadv_mcast_mla_bridge_get(struct net_device *dev, continue; if (tvlv_flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES && - ipv6_addr_is_ll_all_nodes(&br_ip_entry->addr.u.ip6)) + ipv6_addr_is_ll_all_nodes(&br_ip_entry->addr.dst.ip6)) continue; if (!(tvlv_flags & BATADV_MCAST_WANT_NO_RTR6) && - IPV6_ADDR_MC_SCOPE(&br_ip_entry->addr.u.ip6) > + IPV6_ADDR_MC_SCOPE(&br_ip_entry->addr.dst.ip6) > IPV6_ADDR_SCOPE_LINKLOCAL) continue; } diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c index 269ffd2e549b..a1ff0a372185 100644 --- a/net/bridge/br_mdb.c +++ b/net/bridge/br_mdb.c @@ -70,10 +70,10 @@ static void __mdb_entry_to_br_ip(struct br_mdb_entry *entry, struct br_ip *ip) ip->vid = entry->vid; ip->proto = entry->addr.proto; if (ip->proto == htons(ETH_P_IP)) - ip->u.ip4 = entry->addr.u.ip4; + ip->dst.ip4 = entry->addr.u.ip4; #if IS_ENABLED(CONFIG_IPV6) else - ip->u.ip6 = entry->addr.u.ip6; + ip->dst.ip6 = entry->addr.u.ip6; #endif } @@ -158,10 +158,10 @@ static int __mdb_fill_info(struct sk_buff *skb, e.ifindex = ifindex; e.vid = mp->addr.vid; if (mp->addr.proto == htons(ETH_P_IP)) - e.addr.u.ip4 = mp->addr.u.ip4; + e.addr.u.ip4 = mp->addr.dst.ip4; #if IS_ENABLED(CONFIG_IPV6) if (mp->addr.proto == htons(ETH_P_IPV6)) - e.addr.u.ip6 = mp->addr.u.ip6; + e.addr.u.ip6 = mp->addr.dst.ip6; #endif e.addr.proto = mp->addr.proto; nest_ent = nla_nest_start_noflag(skb, @@ -474,10 +474,10 @@ static void br_mdb_switchdev_host_port(struct net_device *dev, }; if (mp->addr.proto == htons(ETH_P_IP)) - ip_eth_mc_map(mp->addr.u.ip4, mdb.addr); + ip_eth_mc_map(mp->addr.dst.ip4, mdb.addr); #if IS_ENABLED(CONFIG_IPV6) else - ipv6_eth_mc_map(&mp->addr.u.ip6, mdb.addr); + ipv6_eth_mc_map(&mp->addr.dst.ip6, mdb.addr); #endif mdb.obj.orig_dev = dev; @@ -520,10 +520,10 @@ void br_mdb_notify(struct net_device *dev, if (pg) { if (mp->addr.proto == htons(ETH_P_IP)) - ip_eth_mc_map(mp->addr.u.ip4, mdb.addr); + ip_eth_mc_map(mp->addr.dst.ip4, mdb.addr); #if IS_ENABLED(CONFIG_IPV6) else - ipv6_eth_mc_map(&mp->addr.u.ip6, mdb.addr); + ipv6_eth_mc_map(&mp->addr.dst.ip6, mdb.addr); #endif mdb.obj.orig_dev = pg->port->dev; switch (type) { diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index a899c22c8f57..e1fb822b9ddb 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -86,7 +86,7 @@ static struct net_bridge_mdb_entry *br_mdb_ip4_get(struct net_bridge *br, struct br_ip br_dst; memset(&br_dst, 0, sizeof(br_dst)); - br_dst.u.ip4 = dst; + br_dst.dst.ip4 = dst; br_dst.proto = htons(ETH_P_IP); br_dst.vid = vid; @@ -101,7 +101,7 @@ static struct net_bridge_mdb_entry *br_mdb_ip6_get(struct net_bridge *br, struct br_ip br_dst; memset(&br_dst, 0, sizeof(br_dst)); - br_dst.u.ip6 = *dst; + br_dst.dst.ip6 = *dst; br_dst.proto = htons(ETH_P_IPV6); br_dst.vid = vid; @@ -126,11 +126,11 @@ struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge *br, switch (skb->protocol) { case htons(ETH_P_IP): - ip.u.ip4 = ip_hdr(skb)->daddr; + ip.dst.ip4 = ip_hdr(skb)->daddr; break; #if IS_ENABLED(CONFIG_IPV6) case htons(ETH_P_IPV6): - ip.u.ip6 = ipv6_hdr(skb)->daddr; + ip.dst.ip6 = ipv6_hdr(skb)->daddr; break; #endif default: @@ -625,9 +625,9 @@ static struct sk_buff *br_multicast_alloc_query(struct net_bridge *br, switch (group->proto) { case htons(ETH_P_IP): - ip4_dst = ip_dst ? ip_dst->u.ip4 : htonl(INADDR_ALLHOSTS_GROUP); + ip4_dst = ip_dst ? ip_dst->dst.ip4 : htonl(INADDR_ALLHOSTS_GROUP); return br_ip4_multicast_alloc_query(br, pg, - ip4_dst, group->u.ip4, + ip4_dst, group->dst.ip4, with_srcs, over_lmqt, sflag, igmp_type, need_rexmit); @@ -636,13 +636,13 @@ static struct sk_buff *br_multicast_alloc_query(struct net_bridge *br, struct in6_addr ip6_dst; if (ip_dst) - ip6_dst = ip_dst->u.ip6; + ip6_dst = ip_dst->dst.ip6; else ipv6_addr_set(&ip6_dst, htonl(0xff020000), 0, 0, htonl(1)); return br_ip6_multicast_alloc_query(br, pg, - &ip6_dst, &group->u.ip6, + &ip6_dst, &group->dst.ip6, with_srcs, over_lmqt, sflag, igmp_type, need_rexmit); @@ -906,7 +906,7 @@ static int br_ip4_multicast_add_group(struct net_bridge *br, return 0; memset(&br_group, 0, sizeof(br_group)); - br_group.u.ip4 = group; + br_group.dst.ip4 = group; br_group.proto = htons(ETH_P_IP); br_group.vid = vid; filter_mode = igmpv2 ? MCAST_EXCLUDE : MCAST_INCLUDE; @@ -930,7 +930,7 @@ static int br_ip6_multicast_add_group(struct net_bridge *br, return 0; memset(&br_group, 0, sizeof(br_group)); - br_group.u.ip6 = *group; + br_group.dst.ip6 = *group; br_group.proto = htons(ETH_P_IPV6); br_group.vid = vid; filter_mode = mldv1 ? MCAST_EXCLUDE : MCAST_INCLUDE; @@ -1079,7 +1079,7 @@ static void br_multicast_send_query(struct net_bridge *br, !br_opt_get(br, BROPT_MULTICAST_QUERIER)) return; - memset(&br_group.u, 0, sizeof(br_group.u)); + memset(&br_group.dst, 0, sizeof(br_group.dst)); if (port ? (own_query == &port->ip4_own_query) : (own_query == &br->ip4_own_query)) { @@ -2506,7 +2506,7 @@ static void br_ip4_multicast_leave_group(struct net_bridge *br, own_query = port ? &port->ip4_own_query : &br->ip4_own_query; memset(&br_group, 0, sizeof(br_group)); - br_group.u.ip4 = group; + br_group.dst.ip4 = group; br_group.proto = htons(ETH_P_IP); br_group.vid = vid; @@ -2530,7 +2530,7 @@ static void br_ip6_multicast_leave_group(struct net_bridge *br, own_query = port ? &port->ip6_own_query : &br->ip6_own_query; memset(&br_group, 0, sizeof(br_group)); - br_group.u.ip6 = *group; + br_group.dst.ip6 = *group; br_group.proto = htons(ETH_P_IPV6); br_group.vid = vid; -- 2.25.4

2 3

[PATCH 0/6] pull request for net: batman-adv 2020-09-18
by Simon Wunderlich 18 Sep '20

18 Sep '20

Hi David, here are some late bugfixes which we would like to have integrated into net. Please pull or let me know of any problem! Thank you, Simon The following changes since commit 279e89b2281af3b1a9f04906e157992c19c9f163: batman-adv: bla: use netif_rx_ni when not in interrupt context (2020-08-18 19:40:03 +0200) are available in the Git repository at: git://git.open-mesh.org/linux-merge.git tags/batadv-net-for-davem-20200918 for you to fetch changes up to 2369e827046920ef0599e6a36b975ac5c0a359c2: batman-adv: mcast: fix duplicate mcast packets from BLA backbone to mesh (2020-09-15 10:05:24 +0200) ---------------------------------------------------------------- Here are some batman-adv bugfixes: - fix wrong type use in backbone_gw hash, by Linus Luessing - disable TT re-routing for multicast packets, by Linus Luessing - Add missing include for in_interrupt(), by Sven Eckelmann - fix BLA/multicast issues for packets sent via unicast, by Linus Luessing (3 patches) ---------------------------------------------------------------- Linus Lüssing (5): batman-adv: bla: fix type misuse for backbone_gw hash indexing batman-adv: mcast/TT: fix wrongly dropped or rerouted packets batman-adv: mcast: fix duplicate mcast packets in BLA backbone from LAN batman-adv: mcast: fix duplicate mcast packets in BLA backbone from mesh batman-adv: mcast: fix duplicate mcast packets from BLA backbone to mesh Sven Eckelmann (1): batman-adv: Add missing include for in_interrupt() net/batman-adv/bridge_loop_avoidance.c | 145 ++++++++++++++++++++++++++------- net/batman-adv/bridge_loop_avoidance.h | 4 +- net/batman-adv/multicast.c | 46 ++++++++--- net/batman-adv/multicast.h | 15 ++++ net/batman-adv/routing.c | 4 + net/batman-adv/soft-interface.c | 11 ++- 6 files changed, 179 insertions(+), 46 deletions(-)

2 7

[PATCH] batman-adv: Fix orig node refcnt leak when creating neigh node
by Xiyu Yang 18 Sep '20

18 Sep '20

batadv_neigh_node_create() is used to create a neigh node object, whose fields will be initialized with the specific object. When a new reference of the specific object is created during the initialization, its refcount should be increased. However, when "neigh_node" object initializes its orig_node field with the "orig_node" object, the function forgets to hold the refcount of the "orig_node", causing a potential refcount leak and use-after-free issue for the reason that the object can be freed in other places. Fix this issue by increasing the refcount of orig_node object during the initialization and adding corresponding batadv_orig_node_put() in batadv_neigh_node_release(). Signed-off-by: Xiyu Yang <xiyuyang19(a)fudan.edu.cn> Signed-off-by: Xin Tan <tanxin.ctf(a)gmail.com> --- net/batman-adv/originator.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 805d8969bdfb..d6c2296f8e35 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -306,6 +306,8 @@ static void batadv_neigh_node_release(struct kref *ref) batadv_hardif_put(neigh_node->if_incoming); + batadv_orig_node_put(neigh_node->orig_node); + kfree_rcu(neigh_node, rcu); } @@ -685,6 +687,7 @@ batadv_neigh_node_create(struct batadv_orig_node *orig_node, kref_get(&hard_iface->refcount); ether_addr_copy(neigh_node->addr, neigh_addr); neigh_node->if_incoming = hard_iface; + kref_get(&orig_node->refcount); neigh_node->orig_node = orig_node; neigh_node->last_seen = jiffies; -- 2.7.4

2 1

[PATCH maint v5 0/3] batman-adv: mcast: BLA fixes
by Linus Lüssing 15 Sep '20

15 Sep '20

These are three fixes for issues which occur when using the batman-adv multicast-to-unicast feature. They fix issues when using the multicast-to-unicast conversion while BLA is enabled and some nodes are sharing the same LAN side. Here it either causes "just" duplicates in the "good" scenario (Patch 3/3). But can also cause multiple BLA backbones to send a frame from the mesh into the same, shared LAN segment (Patch 2/3). Or in the worst case, even reflect packets back to the host in the shared LAN, which completely confuses switches/bridges and ICMPv6 Neighbor Discovery (Patch 1/3). Regards, Linus --- Changelog v6: * Patch 3/3: - removed "is_for_same_orig" variable again and call "continue" directly Changelog v5: * Patch 3/3: - added missing "*" in kernel doc for batadv_bla_check_duplist() Changelog v4: * Patch 1/3: - fixed build with CONFIG_BATMAN_ADV_MCAST=n -> dummy for batadv_mcast_forw_send_orig() * Patch 2/3: - fixed parameters for batadv_bla_rx() with CONFIG_BATMAN_ADV_BLA=n (bool is_bcast -> int packet_type) Changelog v3: * removed 1/4, as it was already applied * renamed title (excluded TT, as already applied) * Patch 1/3: - moved bla-backbone check into multicast code: -> to stay on the safe side for net, to touch less other code paths - the issue was observed specifically for multicast and the fix was tested for that - added a note regarding implications for mcast-fanout * Patch 2/3: - previous approach was broken, it would break the DHCPv6 gateway code; instead distinguish by batadv 3 vs. 4 addr unicast header - added some more code comments - updated commit message with new approach * Patch 3/3: - made code a bit more verbose and explicit - added some more code comments - added missing kernel doc for "orig" parameter to new batadv_bla_check_duplist() Changelog v2: * Adding "Fixes:" lines

1 3

[PATCH maint v5 0/3] batman-adv: mcast: BLA fixes
by Linus Lüssing 15 Sep '20

15 Sep '20

These are three fixes for issues which occur when using the batman-adv multicast-to-unicast feature. They fix issues when using the multicast-to-unicast conversion while BLA is enabled and some nodes are sharing the same LAN side. Here it either causes "just" duplicates in the "good" scenario (Patch 3/3). But can also cause multiple BLA backbones to send a frame from the mesh into the same, shared LAN segment (Patch 2/3). Or in the worst case, even reflect packets back to the host in the shared LAN, which completely confuses switches/bridges and ICMPv6 Neighbor Discovery (Patch 1/3). Regards, Linus --- Changelog v5: * Patch 3/3: - added missing "*" in kernel doc for batadv_bla_check_duplist() Changelog v4: * Patch 1/3: - fixed build with CONFIG_BATMAN_ADV_MCAST=n -> dummy for batadv_mcast_forw_send_orig() * Patch 2/3: - fixed parameters for batadv_bla_rx() with CONFIG_BATMAN_ADV_BLA=n (bool is_bcast -> int packet_type) Changelog v3: * removed 1/4, as it was already applied * renamed title (excluded TT, as already applied) * Patch 1/3: - moved bla-backbone check into multicast code: -> to stay on the safe side for net, to touch less other code paths - the issue was observed specifically for multicast and the fix was tested for that - added a note regarding implications for mcast-fanout * Patch 2/3: - previous approach was broken, it would break the DHCPv6 gateway code; instead distinguish by batadv 3 vs. 4 addr unicast header - added some more code comments - updated commit message with new approach * Patch 3/3: - made code a bit more verbose and explicit - added some more code comments - added missing kernel doc for "orig" parameter to new batadv_bla_check_duplist() Changelog v2: * Adding "Fixes:" lines

2 6

[PATCH maint v4 0/3] batman-adv: mcast: BLA fixes
by Linus Lüssing 14 Sep '20

14 Sep '20

These are three fixes for issues which occur when using the batman-adv multicast-to-unicast feature. They fix issues when using the multicast-to-unicast conversion while BLA is enabled and some nodes are sharing the same LAN side. Here it either causes "just" duplicates in the "good" scenario (Patch 3/3). But can also cause multiple BLA backbones to send a frame from the mesh into the same, shared LAN segment (Patch 2/3). Or in the worst case, even reflect packets back to the host in the shared LAN, which completely confuses switches/bridges and ICMPv6 Neighbor Discovery (Patch 1/3). Regards, Linus --- Changelog v4: * Patch 1/3: - fixed build with CONFIG_BATMAN_ADV_MCAST=n -> dummy for batadv_mcast_forw_send_orig() * Patch 2/3: - fixed parameters for batadv_bla_rx() with CONFIG_BATMAN_ADV_BLA=n (bool is_bcast -> int packet_type) Changelog v3: * removed 1/4, as it was already applied * renamed title (excluded TT, as already applied) * Patch 1/3: - moved bla-backbone check into multicast code: -> to stay on the safe side for net, to touch less other code paths - the issue was observed specifically for multicast and the fix was tested for that - added a note regarding implications for mcast-fanout * Patch 2/3: - previous approach was broken, it would break the DHCPv6 gateway code; instead distinguish by batadv 3 vs. 4 addr unicast header - added some more code comments - updated commit message with new approach * Patch 3/3: - made code a bit more verbose and explicit - added some more code comments - added missing kernel doc for "orig" parameter to new batadv_bla_check_duplist() Changelog v2: * Adding "Fixes:" lines

1 3

[PATCH maint v3 0/3] batman-adv: mcast: BLA fixes
by Linus Lüssing 14 Sep '20

14 Sep '20

These are three fixes for issues which occur when using the batman-adv multicast-to-unicast feature. They fix issues when using the multicast-to-unicast conversion while BLA is enabled and some nodes are sharing the same LAN side. Here it either causes "just" duplicates in the "good" scenario (Patch 3/3). But can also cause multiple BLA backbones to send a frame from the mesh into the same, shared LAN segment (Patch 2/3). Or in the worst case, even reflect packets back to the host in the shared LAN, which completely confuses switches/bridges and ICMPv6 Neighbor Discovery (Patch 1/3). Regards, Linus --- Changelog v3: * removed 1/4, as it was already applied * renamed title (excluded TT, as already applied) * Patch 1/3: - moved bla-backbone check into multicast code: -> to stay on the safe side for net, to touch less other code paths - the issue was observed specifically for multicast and the fix was tested for that - added a note regarding implications for mcast-fanout * Patch 2/3: - previous approach was broken, it would break the DHCPv6 gateway code; instead distinguish by batadv 3 vs. 4 addr unicast header - added some more code comments - updated commit message with new approach * Patch 3/3: - made code a bit more verbose and explicit - added some more code comments - added missing kernel doc for "orig" parameter to new batadv_bla_check_duplist() Changelog v2: * Adding "Fixes:" lines

2 6

Re: Passing VID-aware ethernet frames on plain batX interfaces
by Sven Eckelmann 14 Sep '20

14 Sep '20

On Friday, 11 September 2020 15:03:13 CEST Alessandro Bolletta wrote: > I see. Ok for transmission purposes, but what if I have to receive a tagged > frame? It should not have been send to the other node when there is no TT entry for this mac + VID from the receiver. > Should I only rely to the 8021q interface (eg. bat0.1) or receive the whole > traffic (untagged and tagged) from the plain bat0 interface? Hm? > If this is not feasible, is it possible to handle in someway this? Hm? > A linux > bridge on the top of bat0 interface could make it possible? No, the bridge must also enable the vlan for this bat0 interface. See also https://www.open-mesh.org/projects/batman-adv/wiki/Faq#BATMAN-Advanced-VLAN… Maybe Antonio wants to add more things to this discussion. Kind regards, Sven

4 4

[PATCH] batctl: tcpdump: Fix endianness in ICMPv6 Echo Request/Reply parsing
by Linus Lüssing 13 Sep '20

13 Sep '20

The ICMPv6 Echo Request/Reply sequence number and id as well as the IPv6 header length are two byte long fields and therefore might need a conversion on a little endian system. Otherwise the output will be broken on such a machine. Fixes: 35b37756f4a3 ("add IPv6 support to tcpdump parser") Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- tcpdump.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tcpdump.c b/tcpdump.c index db93681..b9edc20 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -589,13 +589,15 @@ static void dump_ipv6(unsigned char *packet_buff, ssize_t buff_len, break; case ICMP6_ECHO_REQUEST: printf(" echo request, id: %d, seq: %d, length: %hu\n", - icmphdr->icmp6_id, icmphdr->icmp6_seq, - iphdr->ip6_plen); + ntohs(icmphdr->icmp6_id), + ntohs(icmphdr->icmp6_seq), + ntohs(iphdr->ip6_plen)); break; case ICMP6_ECHO_REPLY: printf(" echo reply, id: %d, seq: %d, length: %hu\n", - icmphdr->icmp6_id, icmphdr->icmp6_seq, - iphdr->ip6_plen); + ntohs(icmphdr->icmp6_id), + ntohs(icmphdr->icmp6_seq), + ntohs(iphdr->ip6_plen)); break; case ICMP6_TIME_EXCEEDED: printf(" time exceeded in-transit, length %zu\n", -- 2.28.0

3 2

Passing VID-aware ethernet frames on plain batX interfaces
by Alessandro Bolletta 11 Sep '20

11 Sep '20

Hi, if I pass tagged ethernet traffic inside a bat0 interface (without creating an alias that uses the linux vlan stack for transparent tagging), is this being allowed by batman-adv?

3 7

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N September 2020