B.A.T.M.A.N February 2014

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

25 participants
68 discussions

[B.A.T.M.A.N.] [PATCHv2] batman-adv: add kerneldoc for dst_hint argument
by Antonio Quartulli 16 Feb '14

16 Feb '14

Some helper functions used along the TX path have now a new "dst_hint" argument but the kerneldoc was missing. Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- Changes from v1: - comment rephrased (thanks Marek!) send.c | 1 + send.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/send.c b/send.c index 31a8c19..e8b7124 100644 --- a/send.c +++ b/send.c @@ -311,6 +311,7 @@ out: * @packet_type: the batman unicast packet type to use * @packet_subtype: the unicast 4addr packet subtype (only relevant for unicast * 4addr packets) + * @dst_hint: can be used to override the destination contained in the skb * @vid: the vid to be used to search the translation table * * Look up the recipient node for the destination address in the ethernet diff --git a/send.h b/send.h index aaddaa9..31e8781 100644 --- a/send.h +++ b/send.h @@ -47,6 +47,7 @@ int batadv_send_skb_via_gw(struct batadv_priv *bat_priv, struct sk_buff *skb, * batadv_send_skb_via_tt - send an skb via TT lookup * @bat_priv: the bat priv with all the soft interface information * @skb: the payload to send + * @dst_hint: can be used to override the destination contained in the skb * @vid: the vid to be used to search the translation table * * Look up the recipient node for the destination address in the ethernet @@ -68,6 +69,7 @@ static inline int batadv_send_skb_via_tt(struct batadv_priv *bat_priv, * @bat_priv: the bat priv with all the soft interface information * @skb: the payload to send * @packet_subtype: the unicast 4addr packet subtype to use + * @dst_hint: can be used to override the destination contained in the skb * @vid: the vid to be used to search the translation table * * Look up the recipient node for the destination address in the ethernet -- 1.8.5.3

2 1

[B.A.T.M.A.N.] [PATCH net 10/10] batman-adv: fix potential kernel paging error for unicast transmissions
by Antonio Quartulli 15 Feb '14

15 Feb '14

batadv_send_skb_prepare_unicast(_4addr) might reallocate the skb's data. If it does then our ethhdr pointer is not valid anymore in batadv_send_skb_unicast(), resulting in a kernel paging error. Fixing this by refetching the ethhdr pointer after the potential reallocation. Introduced by 3275e7cc84fb0574e9662e8e74c3b1dab38f7143 ("batman-adv: improve unicast packet (re)routing") Reported-by: Linus Lüssing <linus.luessing(a)web.de> Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- ***This patch is not supposed to be merged in the batman-adv repository*** This is a substitutive patch that I am going to send to net instead of the one that we have in maint (same subject). I am doing this because the original patch together with all the bugfixes that followed it cannot be considered a "simple bugfix" anymore and I'd rather prefer to send it to net-next with a later pull request. This patch instead fixes the same problem but in a much simpler way (does not use of eth_hdr()). I sent it over the ml for peer review. If nobody has any objection I will send it to net. @Linus: I'd like to add your signed-off to this patch because it is essentially your patch but just reworked a bit. Please let me know what you think. Cheers, net/batman-adv/send.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 579f5f0..2f378a1 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -254,9 +254,9 @@ static int batadv_send_skb_unicast(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, unsigned short vid) { - struct ethhdr *ethhdr = (struct ethhdr *)skb->data; + struct ethhdr *ethhdr; struct batadv_unicast_packet *unicast_packet; - int ret = NET_XMIT_DROP; + int ret = NET_XMIT_DROP, hdr_size; if (!orig_node) goto out; @@ -265,12 +265,16 @@ static int batadv_send_skb_unicast(struct batadv_priv *bat_priv, case BATADV_UNICAST: if (!batadv_send_skb_prepare_unicast(skb, orig_node)) goto out; + + hdr_size = sizeof(*unicast_packet); break; case BATADV_UNICAST_4ADDR: if (!batadv_send_skb_prepare_unicast_4addr(bat_priv, skb, orig_node, packet_subtype)) goto out; + + hdr_size = sizeof(struct batadv_unicast_packet_4addr); break; default: /* this function supports UNICAST and UNICAST_4ADDR only. It @@ -279,6 +283,7 @@ static int batadv_send_skb_unicast(struct batadv_priv *bat_priv, goto out; } + eth_hdr = (struct eth_hdr *)(skb->data + hdr_size); unicast_packet = (struct batadv_unicast_packet *)skb->data; /* inform the destination node that we are still missing a correct route -- 1.8.5.3

1 0

[B.A.T.M.A.N.] [PATCHv2] batman-adv: avoid double free when orig_node initialization fails
by Antonio Quartulli 15 Feb '14

15 Feb '14

In the failure path of the orig_node initialization routine the orig_node->bat_iv.bcast_own field is free'd twice: first in batadv_iv_ogm_orig_get() and then later in batadv_orig_node_free_rcu(). Fix it by removing the kfree in batadv_iv_ogm_orig_get(). Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- Change form v1: - remove kfree from batadv_iv_ogm_orig_get() instead of setting orig_node->bat_iv.bcast_own to NULL bat_iv_ogm.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index c07e59f..fdf4322 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -243,18 +243,16 @@ batadv_iv_ogm_orig_get(struct batadv_priv *bat_priv, const uint8_t *addr) size = bat_priv->num_ifaces * sizeof(uint8_t); orig_node->bat_iv.bcast_own_sum = kzalloc(size, GFP_ATOMIC); if (!orig_node->bat_iv.bcast_own_sum) - goto free_bcast_own; + goto free_orig_node; hash_added = batadv_hash_add(bat_priv->orig_hash, batadv_compare_orig, batadv_choose_orig, orig_node, &orig_node->hash_entry); if (hash_added != 0) - goto free_bcast_own; + goto free_orig_node; return orig_node; -free_bcast_own: - kfree(orig_node->bat_iv.bcast_own); free_orig_node: /* free twice, as batadv_orig_node_new sets refcount to 2 */ batadv_orig_node_free_ref(orig_node); -- 1.8.5.3

2 1

[B.A.T.M.A.N.] [PATCH maint 1/2] batman-adv: fix TT CRC computation by ensuring byte order
by Antonio Quartulli 15 Feb '14

15 Feb '14

From: Antonio Quartulli <antonio(a)open-mesh.com> When computing the CRC on a 2byte variable the order of the bytes obviously alters the final result. This means that computing the CRC over the same value on two archs having different endianess leads to different numbers. The global and local translation table CRC computation routine makes this mistake while processing the clients VIDs. The result is a continuous CRC mismatching between nodes having different endianess. Fix this by converting the VID to Network Order before processing it. This guarantees that every node uses the same byte order. Introduced by 21a57f6e7a3b4455dfe68ee07a7b901d9e7f200b ("batman-adv: make the TT CRC logic VLAN specific") Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- translation-table.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/translation-table.c b/translation-table.c index 05c2a9b..24e3267 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1961,6 +1961,7 @@ static uint32_t batadv_tt_global_crc(struct batadv_priv *bat_priv, struct hlist_head *head; uint32_t i, crc_tmp, crc = 0; uint8_t flags; + __be16 tmp_vid; for (i = 0; i < hash->size; i++) { head = &hash->table[i]; @@ -1997,8 +1998,11 @@ static uint32_t batadv_tt_global_crc(struct batadv_priv *bat_priv, orig_node)) continue; - crc_tmp = crc32c(0, &tt_common->vid, - sizeof(tt_common->vid)); + /* use network order to read the VID: this ensures that + * every node reads the bytes in the same order. + */ + tmp_vid = htons(tt_common->vid); + crc_tmp = crc32c(0, &tmp_vid, sizeof(tmp_vid)); /* compute the CRC on flags that have to be kept in sync * among nodes @@ -2032,6 +2036,7 @@ static uint32_t batadv_tt_local_crc(struct batadv_priv *bat_priv, struct hlist_head *head; uint32_t i, crc_tmp, crc = 0; uint8_t flags; + __be16 tmp_vid; for (i = 0; i < hash->size; i++) { head = &hash->table[i]; @@ -2050,8 +2055,11 @@ static uint32_t batadv_tt_local_crc(struct batadv_priv *bat_priv, if (tt_common->flags & BATADV_TT_CLIENT_NEW) continue; - crc_tmp = crc32c(0, &tt_common->vid, - sizeof(tt_common->vid)); + /* use network order to read the VID: this ensures that + * every node reads the bytes in the same order. + */ + tmp_vid = htons(tt_common->vid); + crc_tmp = crc32c(0, &tmp_vid, sizeof(tmp_vid)); /* compute the CRC on flags that have to be kept in sync * among nodes -- 1.8.5.3

3 6

[B.A.T.M.A.N.] [RFC 00/23] Introducing a new routing protocol: B.A.T.M.A.N. V
by Antonio Quartulli 14 Feb '14

14 Feb '14

Hello list, this is the first _RFC_ introducing a new routing protocol in the batman-adv kernel module, namely B.A.T.M.A.N. V. Basically this is the result of three major ideas: 1) separate link cost estimation and routing information spreading (B.A.T.M.A.N. IV performs the two operations by using OGMs only) 2) introduce a throughput based metric (B.A.T.M.A.N. IV metric is mainly based on packet loss) 3) create a new protocol that groups all the knowledge gained so far For what concerns point 1) in this patchset we introduce the Echo Locating Protocol (aka ELP), which is a standalone component aimed to only estimate link costs. ELP was originally written by Linus Lüssing. For point 2) we have already proposed an extension of the cfg80211 module (not yet merged) which allows any kernel module to retrieve the expected throughput towards another peer over a wireless link. ELP is the component in charge of interacting with cfg80211 to retrieve the expected throughput. For wired connections ELP directly reads the bandwidth advertised by the Ethernet card (not optimal in case of complex topologies - but it is a first attempt). Point 3) gets concrete under the new OGMv2 protocol, which is the core of B.A.T.M.A.N. V. The documentation is not yet ready to be linked, because the draft we have on the wiki needs to be adapted to reflect the last changes (in particular about the metric change from TQ to expected throughput). In the various patches some kerneldoc is still missing: I am working on that now. But I wanted to throw the patchset out as soon as possible to let anybody review this code (this is why this is an RFC). Notes: ======= 1) yes,_this_patchset_is_not_yet_checkpatch_clean_ 2) patch 1/23 is already pending on the ml as RFC but I am resending it here since it is part of the whole batman v picture. Cheers, Antonio Quartulli (18): batman-adv: invoke ogm_schedule() only when the interface is activated batman-adv: OGMv2 - add basic infrastructure batman-adv: OGMv2 - implement originators logic batman-adv: OGMv2 - purge obsolete potential routers batman-adv: split name from variable for uint mesh attributes batman-adv: add throughput attribute to hard_ifaces batman-adv: add base throughput attribute batman-adv: add last_unicast_tx to struct neigh_node_elp batman-adv: ELP - compute the metric based on the estimated throughput batman-adv: ELP - send unicast ELP packets for throughput sampling batman-adv: ELP - read estimated throughput from cfg80211 batman-adv: ELP - implement dead neigh node detection batman-adv: ELP - use phydev to determine link characteristics batman-adv: add bat_neigh_free() API batman-adv: B.A.T.M.A.N. V - implement bat_neigh_free() API batman-adv: B.A.T.M.A.N. V - implement neigh_is_equiv_or_better API batman-adv: B.A.T.M.A.N. V - implement bat_neigh_cmp API batman-adv: B.A.T.M.A.N. V - implement bat_orig_print API Linus Luessing (5): batman-adv: Add hard_iface specific sysfs wrapper macros for UINT batman-adv: ELP - adding basic infrastructure batman-adv: ELP - creating neighbor structures batman-adv: ELP - exporting neighbor list via debugfs batman-adv: ELP - adding sysfs parameter for elp interval Makefile | 2 + Makefile.kbuild | 3 + README.external | 1 + bat_algo.h | 26 +- bat_iv_ogm.c | 2 +- bat_v.c | 266 +++++++++++++++++ bat_v_elp.c | 718 +++++++++++++++++++++++++++++++++++++++++++++ bat_v_elp.h | 39 +++ bat_v_ogm.c | 716 ++++++++++++++++++++++++++++++++++++++++++++ bat_v_ogm.h | 32 ++ compat.h | 20 ++ debugfs.c | 17 ++ distributed-arp-table.c | 4 +- fragmentation.c | 8 +- gen-compat-autoconf.sh | 1 + hard-interface.c | 24 +- icmp_socket.c | 2 +- main.c | 32 +- main.h | 16 + network-coding.c | 20 +- originator.c | 69 +++-- originator.h | 2 + packet.h | 50 ++++ send.c | 46 ++- send.h | 10 +- sysfs-class-net-batman-adv | 8 +- sysfs.c | 87 +++++- types.h | 113 +++++++ 28 files changed, 2260 insertions(+), 74 deletions(-) create mode 100644 bat_v.c create mode 100644 bat_v_elp.c create mode 100644 bat_v_elp.h create mode 100644 bat_v_ogm.c create mode 100644 bat_v_ogm.h -- 1.8.5.3

5 67

[B.A.T.M.A.N.] [PATCH 1/4] openwrt routing feed: add three ordex patches for anti-panic, anti-leaking
by Russell Senior 14 Feb '14

14 Feb '14

These three patches successfully stopped panics and memory leaks for me, tested during some extended IRC sessions. Thanks Antonio! This patch adds them to the OpenWrt routing feed patches directory for batman-adv. Signed-off-by: Russell Senior <russell(a)personaltelco.net> --- ...set-mac_header-when-forging-an-ARP-reply-.patch | 38 ++++++++++ .../0010-batman-adv-byte-order-affects-crc.patch | 83 ++++++++++++++++++++++ .../patches/0011-batman-adv-memory-leak-fix.patch | 39 ++++++++++ 3 files changed, 160 insertions(+) create mode 100644 batman-adv/patches/0008-batman-adv-set-mac_header-when-forging-an-ARP-reply-.patch create mode 100644 batman-adv/patches/0010-batman-adv-byte-order-affects-crc.patch create mode 100644 batman-adv/patches/0011-batman-adv-memory-leak-fix.patch diff --git a/batman-adv/patches/0008-batman-adv-set-mac_header-when-forging-an-ARP-reply-.patch b/batman-adv/patches/0008-batman-adv-set-mac_header-when-forging-an-ARP-reply-.patch new file mode 100644 index 0000000..67c6dde --- /dev/null +++ b/batman-adv/patches/0008-batman-adv-set-mac_header-when-forging-an-ARP-reply-.patch @@ -0,0 +1,38 @@ +From 9cfee06f7350c28881b5cb0bfa2901c3b726eb1a Mon Sep 17 00:00:00 2001 +From: Antonio Quartulli <antonio(a)meshcoding.com> +Date: Fri, 31 Jan 2014 00:51:50 +0100 +Subject: [PATCH 8/9] batman-adv: set mac_header when forging an ARP reply in + DAT + +In the TX path we now have functions that rely on the +skb->mac_header field. DAT does not set such field when +creating its own ARP packets thus leading to wrong memory +access. + +Fix it by always setting the mac_header after having forged +the ARP packet. + +Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> +--- + distributed-arp-table.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/distributed-arp-table.c b/distributed-arp-table.c +index 6da587a..0b69b61 100644 +--- a/distributed-arp-table.c ++++ b/distributed-arp-table.c +@@ -1028,6 +1028,11 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv, + if (!skb_new) + goto out; + ++ /* the rest of the TX path assumes that the mac_header offset pointing ++ * to the inner Ethernet header has been set, therefore reset it now. ++ */ ++ skb_reset_mac_header(skb_new); ++ + if (vid & BATADV_VLAN_HAS_TAG) + skb_new = vlan_insert_tag(skb_new, htons(ETH_P_8021Q), + vid & VLAN_VID_MASK); +-- +1.8.5.3 + diff --git a/batman-adv/patches/0010-batman-adv-byte-order-affects-crc.patch b/batman-adv/patches/0010-batman-adv-byte-order-affects-crc.patch new file mode 100644 index 0000000..577d9b7 --- /dev/null +++ b/batman-adv/patches/0010-batman-adv-byte-order-affects-crc.patch @@ -0,0 +1,83 @@ +From: Antonio Quartulli <antonio(a)meshcoding.com> +Date: Tue, 11 Feb 2014 17:05:06 +0100 +Message-Id: <1392134707-2318-1-git-send-email-antonio(a)meshcoding.com> +Subject: [B.A.T.M.A.N.] [PATCH maint 1/2] batman-adv: fix TT CRC computation + by ensuring byte order + +From: Antonio Quartulli <antonio(a)open-mesh.com> + +When computing the CRC on a 2byte variable the order of +the bytes obviously alters the final result. This means +that computing the CRC over the same value on two archs +having different endianess leads to different numbers. + +The global and local translation table CRC computation +routine makes this mistake while processing the clients +VIDs. The result is a continuous CRC mismatching between +nodes having different endianess. + +Fix this by converting the VID to Network Order before +processing it. This guarantees that every node uses the same +byte order. + +Introduced by 21a57f6e7a3b4455dfe68ee07a7b901d9e7f200b +("batman-adv: make the TT CRC logic VLAN specific") + +Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> +--- + translation-table.c | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +diff --git a/translation-table.c b/translation-table.c +index 05c2a9b..24e3267 100644 +--- a/translation-table.c ++++ b/translation-table.c +@@ -1961,6 +1961,7 @@ static uint32_t batadv_tt_global_crc(struct batadv_priv *bat_priv, + struct hlist_head *head; + uint32_t i, crc_tmp, crc = 0; + uint8_t flags; ++ __be16 tmp_vid; + + for (i = 0; i < hash->size; i++) { + head = &hash->table[i]; +@@ -1997,8 +1998,11 @@ static uint32_t batadv_tt_global_crc(struct batadv_priv *bat_priv, + orig_node)) + continue; + +- crc_tmp = crc32c(0, &tt_common->vid, +- sizeof(tt_common->vid)); ++ /* use network order to read the VID: this ensures that ++ * every node reads the bytes in the same order. ++ */ ++ tmp_vid = htons(tt_common->vid); ++ crc_tmp = crc32c(0, &tmp_vid, sizeof(tmp_vid)); + + /* compute the CRC on flags that have to be kept in sync + * among nodes +@@ -2032,6 +2036,7 @@ static uint32_t batadv_tt_local_crc(struct batadv_priv *bat_priv, + struct hlist_head *head; + uint32_t i, crc_tmp, crc = 0; + uint8_t flags; ++ __be16 tmp_vid; + + for (i = 0; i < hash->size; i++) { + head = &hash->table[i]; +@@ -2050,8 +2055,11 @@ static uint32_t batadv_tt_local_crc(struct batadv_priv *bat_priv, + if (tt_common->flags & BATADV_TT_CLIENT_NEW) + continue; + +- crc_tmp = crc32c(0, &tt_common->vid, +- sizeof(tt_common->vid)); ++ /* use network order to read the VID: this ensures that ++ * every node reads the bytes in the same order. ++ */ ++ tmp_vid = htons(tt_common->vid); ++ crc_tmp = crc32c(0, &tmp_vid, sizeof(tmp_vid)); + + /* compute the CRC on flags that have to be kept in sync + * among nodes +-- +1.8.5.3 + + + diff --git a/batman-adv/patches/0011-batman-adv-memory-leak-fix.patch b/batman-adv/patches/0011-batman-adv-memory-leak-fix.patch new file mode 100644 index 0000000..c991d5d --- /dev/null +++ b/batman-adv/patches/0011-batman-adv-memory-leak-fix.patch @@ -0,0 +1,39 @@ +From: Antonio Quartulli <antonio(a)meshcoding.com> +To: b.a.t.m.a.n(a)lists.open-mesh.org +Date: Tue, 11 Feb 2014 17:05:07 +0100 +Subject: [B.A.T.M.A.N.] [PATCH maint 2/2] batman-adv: free skb on TVLV + parsing success + +From: Antonio Quartulli <antonio(a)open-mesh.com> + +When the TVLV parsing routine succeed the skb is left +untouched thus leading to a memory leak. + +Fix this by consuming the skb in case of success. + +Introduced by 0b6aa0d43767889eeda43a132cf5e73df4e63bf2 +("batman-adv: tvlv - basic infrastructure") + +Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> +--- + routing.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/routing.c b/routing.c +index f7579d0..71bf698 100644 +--- a/routing.c ++++ b/routing.c +@@ -1063,6 +1063,8 @@ int batadv_recv_unicast_tvlv(struct sk_buff *skb, + + if (ret != NET_RX_SUCCESS) + ret = batadv_route_unicast_packet(skb, recv_if); ++ else ++ consume_skb(skb); + + return ret; + } +-- +1.8.5.3 + + + -- 1.8.1.2 -- Russell Senior, President russell(a)personaltelco.net

2 6

[B.A.T.M.A.N.] Problem compiling batman for openwrt
by Konstantin Pribluda 13 Feb '14

13 Feb '14

Hi all, I try to compile 2013.4 against trunk of openwrt, and habe problem with batctl: ----------------------%<------------------- CPPFLAGS="-I/home/ko5tik/openwrt/staging_dir/target-mips_34kc_uClibc-0.9.33.2/usr/include -I/home/ko5tik/openwrt/staging_dir/target-mips_34kc_uClibc-0.9.33.2/include -I/home/ko5tik/openwrt/staging_dir/toolchain-mips_34kc_gcc-4.6-linaro_uClibc-0.9.33.2/usr/include -I/home/ko5tik/openwrt/staging_dir/toolchain-mips_34kc_gcc-4.6-linaro_uClibc-0.9.33.2/include" CFLAGS="-Os -pipe -mno-branch-likely -mips32r2 -mtune=34kc -fno-caller-saves -fhonour-copts -Wno-error=unused-but-set-variable -msoft-float -ffunction-sections -fdata-sections -flto" LDFLAGS="-L/home/ko5tik/openwrt/staging_dir/target-mips_34kc_uClibc-0.9.33.2/usr/lib -L/home/ko5tik/openwrt/staging_dir/target-mips_34kc_uClibc-0.9.33.2/lib -L/home/ko5tik/openwrt/staging_dir/toolchain-mips_34kc_gcc-4.6-linaro_uClibc-0.9.33.2/usr/lib -L/home/ko5tik/openwrt/staging_dir/toolchain-mips_34kc_gcc-4.6-linaro_uClibc-0.9.33.2/lib -Wl,--gc-sections -fuse-linker-plugin" make -C /home/ko5tik/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/batman-adv/batctl-2013.4.0 REVISION="" CC="mips-openwrt-linux-uclibc-gcc" DESTDIR="/home/ko5tik/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/batman-adv/batman-adv-2013.4.0/ipkg-install" batctl install make[4]: Entering directory `/home/ko5tik/openwrt/build_dir/target-mips_34kc_uClibc-0.9.33.2/batman-adv/batctl-2013.4.0' mips-openwrt-linux-uclibc-gcc -L/home/ko5tik/openwrt/staging_dir/target-mips_34kc_uClibc-0.9.33.2/usr/lib -L/home/ko5tik/openwrt/staging_dir/target-mips_34kc_uClibc-0.9.33.2/lib -L/home/ko5tik/openwrt/staging_dir/toolchain-mips_34kc_gcc-4.6-linaro_uClibc-0.9.33.2/usr/lib -L/home/ko5tik/openwrt/staging_dir/toolchain-mips_34kc_gcc-4.6-linaro_uClibc-0.9.33.2/lib -Wl,--gc-sections -fuse-linker-plugin main.o bat-hosts.o functions.o sys.o debug.o ping.o traceroute.o tcpdump.o hash.o vis.o debugfs.o ioctl.o list-batman.o translate.o -lm -o batctl /tmp/ccSxljUB.s: Assembler messages: /tmp/ccSxljUB.s:3002: Warning: Macro instruction expanded into multiple instructions /tmp/ccSxljUB.s:3018: Warning: Macro instruction expanded into multiple instructions /tmp/ccSxljUB.s:3117: Warning: Macro instruction expanded into multiple instructions /tmp/ccSxljUB.s:3141: Warning: Macro instruction expanded into multiple instructions /tmp/ccSxljUB.s:3151: Warning: Macro instruction expanded into multiple instructions /tmp/ccSxljUB.s:3205: Warning: Macro instruction expanded into multiple instructions /tmp/ccSxljUB.s:3242: Warning: Macro instruction expanded into multiple instructions /tmp/ccSxljUB.s:3298: Warning: Macro instruction expanded into multiple instructions /tmp/ccSxljUB.s:3314: Warning: Macro instruction expanded into multiple instructions /tmp/ccuGt0iL.s: Assembler messages: /tmp/ccuGt0iL.s:666: Error: opcode not supported on this processor: mips1 (mips1) `ext $2,$2,24,4' /tmp/ccuGt0iL.s:677: Error: opcode not supported on this processor: mips1 (mips1) `ext $2,$2,24,4' /tmp/ccuGt0iL.s:736: Error: opcode not supported on this processor: mips1 (mips1) `ext $2,$2,24,4' /tmp/ccuGt0iL.s:752: Error: opcode not supported on this processor: mips1 (mips1) `ext $2,$2,24,4' /tmp/ccuGt0iL.s:775: Error: opcode not supported on this processor: mips1 (mips1) `ext $2,$2,24,4' /tmp/ccuGt0iL.s:838: Error: opcode not supported on this processor: mips1 (mips1) `ext $2,$2,24,4' /tmp/ccuGt0iL.s:859: Error: opcode not supported on this processor: mips1 (mips1) `ext $2,$2,24,4' /tmp/ccuGt0iL.s:876: Error: opcode not supported on this processor: mips1 (mips1) `ext $3,$3,24,4' /tmp/ccuGt0iL.s:880: Warning: Macro instruction expanded into multiple instructions /tmp/ccuGt0iL.s:909: Error: opcode not supported on this processor: mips1 (mips1) `ext $2,$2,24,4' /tmp/ccuGt0iL.s:941: Error: opcode not supported on this processor: mips1 (mips1) `ext $2,$2,24,4' /tmp/ccuGt0iL.s:945: Warning: Macro instruction expanded into multiple instructions /tmp/ccuGt0iL.s:971: Error: opcode not supported on this processor: mips1 (mips1) `ext $2,$2,24,4' /tmp/ccuGt0iL.s:975: Warning: Macro instruction expanded into multiple instructions /tmp/ccuGt0iL.s:1004: Error: opcode not supported on this processor: mips1 (mips1) `ext $2,$2,24,4' /tmp/ccuGt0iL.s:1032: Error: opcode not supported on this processor: mips1 (mips1) `ext $2,$2,24,4' /tmp/ccuGt0iL.s:1063: Error: opcode not supported on this processor: mips1 (mips1) `ext $2,$2,24,4' /tmp/ccuGt0iL.s:1083: Error: opcode not supported on this processor: mips1 (mips1) `ext $2,$2,24,4' /tmp/ccuGt0iL.s:1091: Error: opcode not supported on this processor: mips1 (mips1) `ext $2,$2,28,4' /tmp/ccuGt0iL.s:1098: Error: opcode not supported on this processor: mips1 (mips1) `ext $2,$2,24,4' /tmp/ccuGt0iL.s:1116: Error: opcode not supported on this processor: mips1 (mips1) `ext $2,$2,24,4' /tmp/ccuGt0iL.s:1249: Error: opcode not supported on this processor: mips1 (mips1) `ext $2,$2,24,4' /tmp/ccuGt0iL.s:1278: Error: opcode not supported on this processor: mips1 (mips1) `ext $2,$2,24,4' /tmp/ccuGt0iL.s:1294: Error: opcode not supported on this processor: mips1 (mips1) `ext $2,$2,24,4' /tmp/ccuGt0iL.s:1317: Error: opcode not supported on this processor: mips1 (mips1) `ext $2,$2,24,4' /tmp/ccuGt0iL.s:1356: Error: opcode not supported on this processor: mips1 (mips1) `ext $2,$2,24,4' /tmp/ccuGt0iL.s:1373: Error: opcode not supported on this processor: mips1 (mips1) `ext $3,$3,24,4' /tmp/ccuGt0iL.s:1377: Warning: Macro instruction expanded into multiple instructions /tmp/ccuGt0iL.s:1411: Error: opcode not supported on this processor: mips1 (mips1) `ext $2,$2,24,4' /tmp/ccuGt0iL.s:1415: Warning: Macro instruction expanded into multiple instructions /tmp/ccuGt0iL.s:1440: Error: opcode not supported on this processor: mips1 (mips1) `ext $2,$2,24,4' /tmp/ccuGt0iL.s:1472: Error: opcode not supported on this processor: mips1 (mips1) `ext $2,$2,24,4' lto-wrapper: mips-openwrt-linux-uclibc-gcc returned 1 exit status /home/ko5tik/openwrt/staging_dir/toolchain-mips_34kc_gcc-4.6-linaro_uClibc-0.9.33.2/lib/gcc/mips-openwrt-linux-uclibc/4.6.4/../../../../mips-openwrt-linux-uclibc/bin/ld: lto-wrapper failed ---------------------------%<------------------------------------------- Adding ARCH=... to build comman in Makefile: MAKE_BATCTL_ARGS += \ REVISION="" \ CC="$(TARGET_CC)" \ ARCH="$(LINUX_KARCH)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ batctl install does not help. Do I miss something? regards, ----[ Konstantin Pribluda http://www.pribluda.de ]---------------- JTec quality components: http://www.pribluda.de/projects/

2 1

[B.A.T.M.A.N.] [PATCH maint] batman-adv: fix soft-interface MTU computation
by Antonio Quartulli 13 Feb '14

13 Feb '14

The current MTU computation always returns a value smaller than 1500bytes even if the real interfaces have an MTU large enough to compensate the batman-adv overhead. Fix the computation by properly returning the highest admitted value. Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- This patch is missing a Reported-by clause because I did not have "russell"'s email address at hand. Will be added later before being merged. Cheers, hard-interface.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/hard-interface.c b/hard-interface.c index 6792e03..0eb0b3b 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -244,7 +244,7 @@ int batadv_hardif_min_mtu(struct net_device *soft_iface) { struct batadv_priv *bat_priv = netdev_priv(soft_iface); const struct batadv_hard_iface *hard_iface; - int min_mtu = ETH_DATA_LEN; + int min_mtu = INT_MAX; rcu_read_lock(); list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) { @@ -259,8 +259,6 @@ int batadv_hardif_min_mtu(struct net_device *soft_iface) } rcu_read_unlock(); - atomic_set(&bat_priv->packet_size_max, min_mtu); - if (atomic_read(&bat_priv->fragmentation) == 0) goto out; @@ -271,13 +269,21 @@ int batadv_hardif_min_mtu(struct net_device *soft_iface) min_mtu = min_t(int, min_mtu, BATADV_FRAG_MAX_FRAG_SIZE); min_mtu -= sizeof(struct batadv_frag_packet); min_mtu *= BATADV_FRAG_MAX_FRAGMENTS; - atomic_set(&bat_priv->packet_size_max, min_mtu); - - /* with fragmentation enabled we can fragment external packets easily */ - min_mtu = min_t(int, min_mtu, ETH_DATA_LEN); out: - return min_mtu - batadv_max_header_len(); + /* report to the other components the maximum amount of bytes that + * batman-adv can send over the wire (without considering the payload + * overhead). For example, this value is used by TT to compute the + * maximum local table table size + */ + atomic_set(&bat_priv->packet_size_max, min_mtu); + + /* the real soft-interface MTU is computed by removing the payload + * overhead from the maximum amount of bytes that was just computed. + * + * However batman-adv does not support MTUs bigger than ETH_DATA_LEN + */ + return min_t(int, min_mtu - batadv_max_header_len(), ETH_DATA_LEN); } /* adjusts the MTU if a new interface with a smaller MTU appeared. */ -- 1.8.5.3

6 34

[B.A.T.M.A.N.] [PATCH maint] batman-adv: avoid double free when orig_node initialization fails
by Antonio Quartulli 11 Feb '14

11 Feb '14

In the failure path of the orig_node initialization routine a double free is hit because orig_node->bat_iv.bcast_own is not set to NULL after being free'd. Fix it by setting bcast_own to NULL after having free'd it. Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- bat_iv_ogm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index c07e59f..cb4c18a 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -255,6 +255,8 @@ batadv_iv_ogm_orig_get(struct batadv_priv *bat_priv, const uint8_t *addr) free_bcast_own: kfree(orig_node->bat_iv.bcast_own); + /* make it NULL to avoid second free in batadv_iv_ogm_orig_free() */ + orig_node->bat_iv.bcast_own = NULL; free_orig_node: /* free twice, as batadv_orig_node_new sets refcount to 2 */ batadv_orig_node_free_ref(orig_node); -- 1.8.5.3

1 0

[B.A.T.M.A.N.] [PATCH-maint] batman-adv: fix potential orig_node reference leak
by Simon Wunderlich 11 Feb '14

11 Feb '14

Since batadv_orig_node_new() sets the refcount to two, assuming that the calling function will use a reference for putting the orig_node into a hash or similar, both references must be freed if initialization of the orig_node fails. Otherwise that object may be leaked in that error case. Reported-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> --- bat_iv_ogm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 6f4fcdc..6000337 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -256,6 +256,8 @@ batadv_iv_ogm_orig_get(struct batadv_priv *bat_priv, const uint8_t *addr) free_bcast_own: kfree(orig_node->bat_iv.bcast_own); free_orig_node: + /* free twice, as batadv_orig_node_new set refcount to 2 */ + batadv_orig_node_free_ref(orig_node); batadv_orig_node_free_ref(orig_node); return NULL; -- 1.7.10.4

4 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 February 2014