Repository : ssh://git@open-mesh.org/batman-adv

On branch : maint

commit af5fa950cbb6b6c4121763ea8d505a30219a3e2e Author: Marek Lindner mareklindner@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@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); }

/**