commits February 2014

commits@lists.open-mesh.org

1 participants
64 discussions

[linux-merge]linux integration; branch, merge/master, updated. v3.13-rc1-2036-g669cbd5
by postmaster＠open-mesh.org 15 Feb '14

15 Feb '14

The following commit has been merged in the merge/master branch: commit 669cbd55edae689ce151bc17860f9cd236b72c5e Merge: 5dbc980182623f66508ad59d66f1c911f83e4496 4b78c87e26da64e8c1f586391917b50e243fac9b Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Wed Jan 15 23:52:07 2014 +0100 Merge commit '4b78c87e26da64e8c1f586391917b50e243fac9b' into merge/master diff --combined net/batman-adv/bat_iv_ogm.c index 921ac20,512159b..512159b --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@@ -598,7 -598,8 +598,8 @@@ out return res; } - /* batadv_iv_ogm_aggregate_new - create a new aggregated packet and add this + /** + * batadv_iv_ogm_aggregate_new - create a new aggregated packet and add this * packet to it. * @packet_buff: pointer to the OGM * @packet_len: (total) length of the OGM @@@ -1745,7 -1746,8 +1746,8 @@@ static int batadv_iv_ogm_receive(struc return NET_RX_SUCCESS; } - /* batadv_iv_ogm_orig_print_neigh - print neighbors for the originator table + /** + * batadv_iv_ogm_orig_print_neigh - print neighbors for the originator table * @orig_node: the orig_node for which the neighbors are printed * @if_outgoing: outgoing interface for these entries * @seq: debugfs table seq_file struct diff --combined net/batman-adv/bridge_loop_avoidance.c index 5c0eda4,05f0712..05f0712 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@@ -130,7 -130,9 +130,9 @@@ static void batadv_claim_free_ref(struc call_rcu(&claim->rcu, batadv_claim_free_rcu); } - /* @bat_priv: the bat priv with all the soft interface information + /** + * batadv_claim_hash_find + * @bat_priv: the bat priv with all the soft interface information * @data: search data (may be local/static data) * * looks for a claim in the hash, and returns it if found @@@ -449,7 -451,9 +451,9 @@@ batadv_bla_update_own_backbone_gw(struc batadv_backbone_gw_free_ref(backbone_gw); } - /* @bat_priv: the bat priv with all the soft interface information + /** + * batadv_bla_answer_request - answer a bla request by sending own claims + * @bat_priv: the bat priv with all the soft interface information * @vid: the vid where the request came on * * Repeat all of our own claims, and finally send an ANNOUNCE frame @@@ -495,7 -499,9 +499,9 @@@ static void batadv_bla_answer_request(s batadv_backbone_gw_free_ref(backbone_gw); } - /* @backbone_gw: the backbone gateway from whom we are out of sync + /** + * batadv_bla_send_request - send a request to repeat claims + * @backbone_gw: the backbone gateway from whom we are out of sync * * When the crc is wrong, ask the backbone gateway for a full table update. * After the request, it will repeat all of his own claims and finally @@@ -520,7 -526,9 +526,9 @@@ static void batadv_bla_send_request(str } } - /* @bat_priv: the bat priv with all the soft interface information + /** + * batadv_bla_send_announce + * @bat_priv: the bat priv with all the soft interface information * @backbone_gw: our backbone gateway which should be announced * * This function sends an announcement. It is called from multiple @@@ -844,7 -852,9 +852,9 @@@ static int batadv_check_claim_group(str } - /* @bat_priv: the bat priv with all the soft interface information + /** + * batadv_bla_process_claim + * @bat_priv: the bat priv with all the soft interface information * @skb: the frame to be checked * * Check if this is a claim frame, and process it accordingly. @@@ -1311,7 -1321,9 +1321,9 @@@ out - /* @bat_priv: the bat priv with all the soft interface information + /** + * batadv_bla_is_backbone_gw_orig + * @bat_priv: the bat priv with all the soft interface information * @orig: originator mac address * @vid: VLAN identifier * diff --combined net/batman-adv/main.c index e56b4d6,66ae135..66ae135 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@@ -275,7 -275,7 +275,7 @@@ int batadv_max_header_len(void sizeof(struct batadv_coded_packet)); #endif - return header_len; + return header_len + ETH_HLEN; } /** diff --combined net/batman-adv/translation-table.c index a6fb1ff,b6071f6..b6071f6 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@@ -1382,7 -1382,8 +1382,8 @@@ out return ret; } - /* batadv_transtable_best_orig - Get best originator list entry from tt entry + /** + * batadv_transtable_best_orig - Get best originator list entry from tt entry * @bat_priv: the bat priv with all the soft interface information * @tt_global_entry: global translation table entry to be analyzed * @@@ -1426,8 -1427,9 +1427,9 @@@ batadv_transtable_best_orig(struct bata return best_entry; } - /* batadv_tt_global_print_entry - print all orig nodes who announce the address - * for this global entry + /** + * batadv_tt_global_print_entry - print all orig nodes who announce the address + * for this global entry * @bat_priv: the bat priv with all the soft interface information * @tt_global_entry: global translation table entry to be printed * @seq: debugfs table seq_file struct diff --combined net/batman-adv/types.h index b53f90d,78370ab..78370ab --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@@ -333,7 -333,8 +333,8 @@@ struct batadv_neigh_node struct rcu_head rcu; }; - /* struct batadv_neigh_node_bat_iv - neighbor information per outgoing + /** + * struct batadv_neigh_node_bat_iv - neighbor information per outgoing * interface for BATMAN IV * @tq_recv: ring buffer of received TQ values from this neigh node * @tq_index: ring buffer index @@@ -350,7 -351,8 +351,8 @@@ struct batadv_neigh_ifinfo_bat_iv uint8_t real_packet_count; }; - /* struct batadv_neigh_ifinfo - neighbor information per outgoing interface + /** + * struct batadv_neigh_ifinfo - neighbor information per outgoing interface * @list: list node for batadv_neigh_node::ifinfo_list * @if_outgoing: pointer to outgoing hard interface * @bat_iv: B.A.T.M.A.N. IV private structure -- linux integration

1 0

[batman-adv] master: Merge branch 'next' (77cece9)
by postmaster＠open-mesh.org 15 Feb '14

15 Feb '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 77cece93db879af1060e52580089be60557d7a21 Merge: da134af d805612 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sat Feb 15 09:43:14 2014 +0800 Merge branch 'next' >--------------------------------------------------------------- 77cece93db879af1060e52580089be60557d7a21 bat_iv_ogm.c | 6 ++---- routing.c | 2 ++ translation-table.c | 16 ++++++++++++---- 3 files changed, 16 insertions(+), 8 deletions(-)

1 0

[batman-adv] master's head updated: Merge branch 'next' (77cece9)
by postmaster＠open-mesh.org 15 Feb '14

15 Feb '14

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: be4385e batman-adv: fix TT CRC computation by ensuring byte order 9289542 batman-adv: free skb on TVLV parsing success d4acda1 batman-adv: avoid double free when orig_node initialization fails d805612 Merge branch 'maint' into next 77cece9 Merge branch 'next'

1 0

[batman-adv] next: Merge branch 'maint' into next (d805612)
by postmaster＠open-mesh.org 15 Feb '14

15 Feb '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit d80561222893dfca2bbf32dc75a697fd24bbf14e Merge: 637eb9c d4acda1 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sat Feb 15 09:42:19 2014 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- d80561222893dfca2bbf32dc75a697fd24bbf14e bat_iv_ogm.c | 6 ++---- routing.c | 2 ++ translation-table.c | 16 ++++++++++++---- 3 files changed, 16 insertions(+), 8 deletions(-)

1 0

[batman-adv] next's head updated: Merge branch 'maint' into next (d805612)
by postmaster＠open-mesh.org 15 Feb '14

15 Feb '14

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: be4385e batman-adv: fix TT CRC computation by ensuring byte order 9289542 batman-adv: free skb on TVLV parsing success d4acda1 batman-adv: avoid double free when orig_node initialization fails d805612 Merge branch 'maint' into next

1 0

[batman-adv] maint: batman-adv: avoid double free when orig_node initialization fails (d4acda1)
by postmaster＠open-mesh.org 15 Feb '14

15 Feb '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit d4acda1cb9cca135e7b91777bb2680518b3cffa0 Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Sat Feb 15 02:17:20 2014 +0100 batman-adv: avoid double free when orig_node initialization fails 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> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- d4acda1cb9cca135e7b91777bb2680518b3cffa0 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 0

[batman-adv] maint: batman-adv: free skb on TVLV parsing success (9289542)
by postmaster＠open-mesh.org 15 Feb '14

15 Feb '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 9289542085d7e298b90c7b6fb6efb509dab69d8b Author: Antonio Quartulli <antonio(a)open-mesh.com> Date: Tue Feb 11 17:05:07 2014 +0100 batman-adv: free skb on TVLV parsing success 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") Reported-by: Russel Senior <russell(a)personaltelco.net> Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> Tested-by: Russell Senior <russell(a)personaltelco.net> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 9289542085d7e298b90c7b6fb6efb509dab69d8b 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 0

[batman-adv] maint: batman-adv: fix TT CRC computation by ensuring byte order (be4385e)
by postmaster＠open-mesh.org 15 Feb '14

15 Feb '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit be4385eacf30ad55a5cf4574768624ce8141a0c7 Author: Antonio Quartulli <antonio(a)open-mesh.com> Date: Tue Feb 11 17:05:06 2014 +0100 batman-adv: fix TT CRC computation by ensuring byte order 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") Reported-by: Russel Senior <russell(a)personaltelco.net> Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> Tested-by: Russell Senior <russell(a)personaltelco.net> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- be4385eacf30ad55a5cf4574768624ce8141a0c7 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 0

[batman-adv] master's head updated: Merge branch 'next' (da134af)
by postmaster＠open-mesh.org 11 Feb '14

11 Feb '14

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: cb4d66e batman-adv: fix potential orig_node reference leak df99b07 batman-adv: fix memory access by setting mac_header in DAT 637eb9c Merge branch 'maint' into next da134af Merge branch 'next'

1 0

[batman-adv] master: Merge branch 'next' (da134af)
by postmaster＠open-mesh.org 11 Feb '14

11 Feb '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit da134af671c9d51a3d248a78a8ecec5f237dc25f Merge: 548c938 637eb9c Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Tue Feb 11 20:09:19 2014 +0800 Merge branch 'next' >--------------------------------------------------------------- da134af671c9d51a3d248a78a8ecec5f237dc25f bat_iv_ogm.c | 2 ++ distributed-arp-table.c | 5 +++++ 2 files changed, 7 insertions(+)

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits February 2014