commits September 2015

commits@lists.open-mesh.org

1 participants
41 discussions

[batman-adv] maint: batman-adv: detect local excess vlans in TT request (2dd1d9f)
by postmaster＠open-mesh.org 06 Sep '15

06 Sep '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 2dd1d9f06ac1208b1921aa90d479c3940bc70b4f Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Wed Sep 2 20:09:56 2015 +0200 batman-adv: detect local excess vlans in TT request If the local representation of the global TT table of one originator has more VLAN entries than the respective TT update, there is some inconsistency present. By detecting and reporting this inconsistency, the global table gets updated and the excess VLAN will get removed in the process. Reported-by: Alessandro Bolletta <alessandro(a)mediaspot.net> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> Acked-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 2dd1d9f06ac1208b1921aa90d479c3940bc70b4f net/batman-adv/translation-table.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 9ac1a46..7e4657e 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -2394,8 +2394,8 @@ static bool batadv_tt_global_check_crc(struct batadv_orig_node *orig_node, { struct batadv_tvlv_tt_vlan_data *tt_vlan_tmp; struct batadv_orig_node_vlan *vlan; + int i, orig_num_vlan; uint32_t crc; - int i; /* check if each received CRC matches the locally stored one */ for (i = 0; i < num_vlan; i++) { @@ -2421,6 +2421,18 @@ static bool batadv_tt_global_check_crc(struct batadv_orig_node *orig_node, return false; } + /* check if any excess VLANs exist locally for the originator + * which are not mentioned in the TVLV from the originator. + */ + rcu_read_lock(); + orig_num_vlan = 0; + list_for_each_entry_rcu(vlan, &orig_node->vlan_list, list) + orig_num_vlan++; + rcu_read_unlock(); + + if (orig_num_vlan > num_vlan) + return false; + return true; }

1 0

[batman-adv] maint: batman-adv: avoid keeping false temporary entry (4a73d74)
by postmaster＠open-mesh.org 06 Sep '15

06 Sep '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 4a73d7438dfb60c7ac82758875292bc14f363b45 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Wed Sep 2 20:09:55 2015 +0200 batman-adv: avoid keeping false temporary entry In the case when a temporary entry is added first and a proper tt entry is added after that, the temporary tt entry is kept in the orig list. However the temporary flag is removed at this point, and therefore the purge function can not find this temporary entry anymore. Therefore, remove the previous temp entry before adding the new proper one. This case can happen if a client behind a given originator moves before the TT announcement is sent out. Other than that, this case can also be created by bogus or malicious payload frames for VLANs which are not existent on the sending originator. Reported-by: Alessandro Bolletta <alessandro(a)mediaspot.net> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> Acked-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 4a73d7438dfb60c7ac82758875292bc14f363b45 net/batman-adv/translation-table.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 39283ff..9ac1a46 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -1419,9 +1419,15 @@ static bool batadv_tt_global_add(struct batadv_priv *bat_priv, } /* if the client was temporary added before receiving the first - * OGM announcing it, we have to clear the TEMP flag + * OGM announcing it, we have to clear the TEMP flag. Also, + * remove the previous temporary orig node and re-add it + * if required. If the orig entry changed, the new one which + * is a non-temporary entry is preferred. */ - common->flags &= ~BATADV_TT_CLIENT_TEMP; + if (common->flags & BATADV_TT_CLIENT_TEMP) { + batadv_tt_global_del_orig_list(tt_global_entry); + common->flags &= ~BATADV_TT_CLIENT_TEMP; + } /* the change can carry possible "attribute" flags like the * TT_CLIENT_WIFI, therefore they have to be copied in the

1 0

[batman-adv] maint: batman-adv: fix speedy join for DAT cache replies (2decb5f)
by postmaster＠open-mesh.org 06 Sep '15

06 Sep '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 2decb5f1fef1484f1b7319aaf2f36b5492d8d943 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Wed Sep 2 20:09:54 2015 +0200 batman-adv: fix speedy join for DAT cache replies DAT Cache replies are answered on behalf of other clients which are not connected to the answering originator. Therefore, we shouldn't add these clients to the answering originators TT table through speed join to avoid bogus entries. Reported-by: Alessandro Bolletta <alessandro(a)mediaspot.net> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> Acked-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 2decb5f1fef1484f1b7319aaf2f36b5492d8d943 net/batman-adv/routing.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index c360c0c..96b5daa 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -836,6 +836,7 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, uint8_t *orig_addr; struct batadv_orig_node *orig_node = NULL; int check, hdr_size = sizeof(*unicast_packet); + enum batadv_subtype subtype; bool is4addr; unicast_packet = (struct batadv_unicast_packet *)skb->data; @@ -863,10 +864,20 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, /* packet for me */ if (batadv_is_my_mac(bat_priv, unicast_packet->dest)) { if (is4addr) { - batadv_dat_inc_counter(bat_priv, - unicast_4addr_packet->subtype); - orig_addr = unicast_4addr_packet->src; - orig_node = batadv_orig_hash_find(bat_priv, orig_addr); + subtype = unicast_4addr_packet->subtype; + batadv_dat_inc_counter(bat_priv, subtype); + + /* Only payload data should be considered for speedy + * join. For example, DAT also uses unicast 4addr + * types, but those packets should not be considered + * for speedy join, since the clients do not actually + * reside at the sending originator. + */ + if (subtype == BATADV_P_DATA) { + orig_addr = unicast_4addr_packet->src; + orig_node = batadv_orig_hash_find(bat_priv, + orig_addr); + } } if (batadv_dat_snoop_incoming_arp_request(bat_priv, skb,

1 0

[batman-adv] master: Merge branch 'next' (41e304b)
by postmaster＠open-mesh.org 06 Sep '15

06 Sep '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 41e304b2983b08b11952f64b36280f0bb313edae Merge: fff4c83 5c11589 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Sep 6 16:09:35 2015 +0800 Merge branch 'next' >--------------------------------------------------------------- 41e304b2983b08b11952f64b36280f0bb313edae net/batman-adv/distributed-arp-table.c | 2 +- net/batman-adv/multicast.c | 4 ++-- net/batman-adv/network-coding.c | 2 +- net/batman-adv/translation-table.c | 5 ++++- 4 files changed, 8 insertions(+), 5 deletions(-)

1 0

[batman-adv] master's head updated: Merge branch 'next' (41e304b)
by postmaster＠open-mesh.org 06 Sep '15

06 Sep '15

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: dba67bc batman-adv: Fix memory leak on tt add with invalid vlan af35586 batman-adv: Remove unnecessary braces for test_bit() in DAT 5abaf07 batman-adv: Remove unnecessary braces for test_bit() in NC d126204 batman-adv: Remove unnecessary braces for test_bit() in MCAST 5c11589 Merge branch 'maint' into next 41e304b Merge branch 'next'

1 0

[batman-adv] next: Merge branch 'maint' into next (5c11589)
by postmaster＠open-mesh.org 06 Sep '15

06 Sep '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 5c115891259452212a72b6b7380df767a5dfda38 Merge: 071aadb d126204 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Sep 6 16:08:52 2015 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- 5c115891259452212a72b6b7380df767a5dfda38 net/batman-adv/distributed-arp-table.c | 2 +- net/batman-adv/multicast.c | 4 ++-- net/batman-adv/network-coding.c | 2 +- net/batman-adv/translation-table.c | 5 ++++- 4 files changed, 8 insertions(+), 5 deletions(-)

1 0

[batman-adv] next's head updated: Merge branch 'maint' into next (5c11589)
by postmaster＠open-mesh.org 06 Sep '15

06 Sep '15

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: dba67bc batman-adv: Fix memory leak on tt add with invalid vlan af35586 batman-adv: Remove unnecessary braces for test_bit() in DAT 5abaf07 batman-adv: Remove unnecessary braces for test_bit() in NC d126204 batman-adv: Remove unnecessary braces for test_bit() in MCAST 5c11589 Merge branch 'maint' into next

1 0

[batman-adv] maint: batman-adv: Remove unnecessary braces for test_bit() in MCAST (d126204)
by postmaster＠open-mesh.org 06 Sep '15

06 Sep '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit d126204d0471e0972142697f36364443a0bbc9cc Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Fri Aug 14 17:23:50 2015 +0200 batman-adv: Remove unnecessary braces for test_bit() in MCAST Fixes: 1798ad3f ("batman-adv: Fix broken MCAST capability check") Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- d126204d0471e0972142697f36364443a0bbc9cc net/batman-adv/multicast.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 8bdd69f..4541f08 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -740,7 +740,7 @@ static void batadv_mcast_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv, * is a completely new orig_node no need to decrease the counter. */ if (orig_mcast_enabled && - !(test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities))) { + !test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities)) { if (orig_initialized) atomic_dec(&bat_priv->mcast.num_disabled); set_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities); @@ -798,7 +798,7 @@ void batadv_mcast_purge_orig(struct batadv_orig_node *orig) spin_lock_bh(&orig->mcast_handler_lock); - if (!(test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities)) && + if (!test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities) && test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capa_initialized)) atomic_dec(&bat_priv->mcast.num_disabled);

1 0

[batman-adv] maint: batman-adv: Remove unnecessary braces for test_bit() in NC (5abaf07)
by postmaster＠open-mesh.org 06 Sep '15

06 Sep '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 5abaf07b4c24ab2d7bd9b0c0de946b1ee5e946ff Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Fri Aug 14 17:23:49 2015 +0200 batman-adv: Remove unnecessary braces for test_bit() in NC Fixes: dfb27e75 ("batman-adv: Fix broken NC capability check") Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 5abaf07b4c24ab2d7bd9b0c0de946b1ee5e946ff net/batman-adv/network-coding.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index 55a0b28..1a1f7e6 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -894,7 +894,7 @@ void batadv_nc_update_nc_node(struct batadv_priv *bat_priv, goto out; /* check if orig node is network coding enabled */ - if (!(test_bit(BATADV_ORIG_CAPA_HAS_NC, &orig_node->capabilities))) + if (!test_bit(BATADV_ORIG_CAPA_HAS_NC, &orig_node->capabilities)) goto out; /* accept ogms from 'good' neighbors and single hop neighbors */

1 0

[batman-adv] maint: batman-adv: Remove unnecessary braces for test_bit() in DAT (af35586)
by postmaster＠open-mesh.org 06 Sep '15

06 Sep '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit af3558688698479a56034f0fcbca164be2052aa8 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Fri Aug 14 17:23:48 2015 +0200 batman-adv: Remove unnecessary braces for test_bit() in DAT Fixes: de466678 ("batman-adv: Fix broken DAT capability check") Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- af3558688698479a56034f0fcbca164be2052aa8 net/batman-adv/distributed-arp-table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 1caf7d2..63243a3 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -453,7 +453,7 @@ static bool batadv_is_orig_node_eligible(struct batadv_dat_candidate *res, int j; /* check if orig node candidate is running DAT */ - if (!(test_bit(BATADV_ORIG_CAPA_HAS_DAT, &candidate->capabilities))) + if (!test_bit(BATADV_ORIG_CAPA_HAS_DAT, &candidate->capabilities)) goto out; /* Check if this node has already been selected... */

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits September 2015