commits November 2015

commits@lists.open-mesh.org

1 participants
68 discussions

[batman-adv] master: Merge branch 'next' (f4b76a0)
by postmaster＠open-mesh.org 17 Nov '15

17 Nov '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit f4b76a0e7eec52b6bf10312edc4749113cb54055 Merge: 41a559a c96b7dc Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Tue Nov 17 16:50:01 2015 +0800 Merge branch 'next' >--------------------------------------------------------------- f4b76a0e7eec52b6bf10312edc4749113cb54055 net/batman-adv/distributed-arp-table.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

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

17 Nov '15

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: e897e5e batman-adv: Fix invalid stack access in batadv_dat_select_candidates c96b7dc Merge branch 'maint' into next

1 0

[batman-adv] next: Merge branch 'maint' into next (c96b7dc)
by postmaster＠open-mesh.org 17 Nov '15

17 Nov '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit c96b7dc10b6ce1e79655cf7ac0f800e854783f63 Merge: 553b8bf e897e5e Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Tue Nov 17 16:49:39 2015 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- c96b7dc10b6ce1e79655cf7ac0f800e854783f63 net/batman-adv/distributed-arp-table.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[batman-adv] maint: batman-adv: Fix invalid stack access in batadv_dat_select_candidates (e897e5e)
by postmaster＠open-mesh.org 17 Nov '15

17 Nov '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit e897e5ed34eaa8fcf4b1dabebecb571ce3d186cd Author: Sven Eckelmann <sven(a)open-mesh.com> Date: Tue Nov 3 10:05:44 2015 +0100 batman-adv: Fix invalid stack access in batadv_dat_select_candidates batadv_dat_select_candidates provides an u32 to batadv_hash_dat but it needs a batadv_dat_entry with at least ip and vid filled in. Fixes: 3e26722bc9f2 ("batman-adv: make the Distributed ARP Table vlan aware") Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> Acked-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- e897e5ed34eaa8fcf4b1dabebecb571ce3d186cd net/batman-adv/distributed-arp-table.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 63243a3..96c74f7 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -564,6 +564,7 @@ batadv_dat_select_candidates(struct batadv_priv *bat_priv, __be32 ip_dst) int select; batadv_dat_addr_t last_max = BATADV_DAT_ADDR_MAX, ip_key; struct batadv_dat_candidate *res; + struct batadv_dat_entry dat; if (!bat_priv->orig_hash) return NULL; @@ -573,7 +574,9 @@ batadv_dat_select_candidates(struct batadv_priv *bat_priv, __be32 ip_dst) if (!res) return NULL; - ip_key = (batadv_dat_addr_t)batadv_hash_dat(&ip_dst, + dat.ip = ip_dst; + dat.vid = 0; + ip_key = (batadv_dat_addr_t)batadv_hash_dat(&dat, BATADV_DAT_ADDR_MAX); batadv_dbg(BATADV_DBG_DAT, bat_priv,

1 0

[batman-adv] master: batman-adv: Fix lockdep annotation of batadv_tlv_container_remove (41a559a)
by postmaster＠open-mesh.org 17 Nov '15

17 Nov '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 41a559a1d48b6fbb17690b7bdcc155668a8e751d Author: Sven Eckelmann <sven(a)open-mesh.com> Date: Tue Nov 3 17:43:05 2015 +0100 batman-adv: Fix lockdep annotation of batadv_tlv_container_remove The function handles tlv containers and not tlv handlers. Thus the lockdep_assert_held has to check for the container_list lock. Fixes: 5b95c427d187 ("batman-adv: Annotate deleting functions with external lock via lockdep") Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 41a559a1d48b6fbb17690b7bdcc155668a8e751d net/batman-adv/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 062d319..a8dcab8 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -749,7 +749,7 @@ static u16 batadv_tvlv_container_list_size(struct batadv_priv *bat_priv) static void batadv_tvlv_container_remove(struct batadv_priv *bat_priv, struct batadv_tvlv_container *tvlv) { - lockdep_assert_held(&bat_priv->tvlv.handler_list_lock); + lockdep_assert_held(&bat_priv->tvlv.container_list_lock); if (!tvlv) return;

1 0

[batman-adv] master's head updated: Merge branch 'next' (dd54d61)
by postmaster＠open-mesh.org 17 Nov '15

17 Nov '15

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: af5fa95 batman-adv: fix erroneous client entry duplicate detection 553b8bf Merge branch 'maint' into next dd54d61 Merge branch 'next'

1 0

[batman-adv] master: Merge branch 'next' (dd54d61)
by postmaster＠open-mesh.org 17 Nov '15

17 Nov '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit dd54d61b7ae1634848ba8ea55f8b3306dad52048 Merge: 348a5da 553b8bf Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Tue Nov 17 16:24:56 2015 +0800 Merge branch 'next' >--------------------------------------------------------------- dd54d61b7ae1634848ba8ea55f8b3306dad52048 net/batman-adv/translation-table.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --cc net/batman-adv/translation-table.c index d98476f,211263b..92af58b --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@@ -68,11 -68,7 +68,11 @@@ static void batadv_tt_global_del(struc unsigned short vid, const char *message, bool roaming); -/* returns 1 if they are the same mac addr and vid */ +/** + * batadv_compare_tt + * - * Return: 1 if they are the same mac addr ++ * Return: 1 if they are the same mac addr and vid + */ static int batadv_compare_tt(const struct hlist_node *node, const void *data2) { const void *data1 = container_of(node, struct batadv_tt_common_entry,

1 0

[batman-adv] next's head updated: Merge branch 'maint' into next (553b8bf)
by postmaster＠open-mesh.org 17 Nov '15

17 Nov '15

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: af5fa95 batman-adv: fix erroneous client entry duplicate detection 553b8bf Merge branch 'maint' into next

1 0

[batman-adv] next: Merge branch 'maint' into next (553b8bf)
by postmaster＠open-mesh.org 17 Nov '15

17 Nov '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 553b8bf6d365be15303d50bd58e9446c89f68300 Merge: 0437624 af5fa95 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Tue Nov 17 16:23:53 2015 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- 553b8bf6d365be15303d50bd58e9446c89f68300 net/batman-adv/translation-table.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

1 0

[batman-adv] maint: batman-adv: fix erroneous client entry duplicate detection (af5fa95)
by postmaster＠open-mesh.org 17 Nov '15

17 Nov '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit af5fa950cbb6b6c4121763ea8d505a30219a3e2e Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Thu Aug 6 10:38:54 2015 +0200 batman-adv: fix erroneous client entry duplicate detection The translation table implementation, namely batadv_compare_tt(), is used to compare two client entries and deciding if they are the holding the same information. Each client entry is identified by its mac address and its VLAN id (VID). Consequently, batadv_compare_tt() has to not only compare the mac addresses but also the VIDs. Without this fix adding a new client entry that possesses the same mac address as another client but operates on a different VID will fail because both client entries will considered identical. Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- af5fa950cbb6b6c4121763ea8d505a30219a3e2e net/batman-adv/translation-table.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 7e4657e..77290cd 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -67,13 +67,15 @@ static void batadv_tt_global_del(struct batadv_priv *bat_priv, unsigned short vid, const char *message, bool roaming); -/* returns 1 if they are the same mac addr */ +/* returns 1 if they are the same mac addr and vid */ static int batadv_compare_tt(const struct hlist_node *node, const void *data2) { const void *data1 = container_of(node, struct batadv_tt_common_entry, hash_entry); + const struct batadv_tt_common_entry* tt1 = data1; + const struct batadv_tt_common_entry* tt2 = data2; - return batadv_compare_eth(data1, data2); + return (tt1->vid == tt2->vid) && batadv_compare_eth(data1, data2); } /**

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits November 2015