The following commit has been merged in the maint branch: commit d1b1d7c61046afc9288d1e6c89f27839a588bd7b Author: Antonio Quartulli ordex@autistici.org Date: Sun Oct 16 18:53:37 2011 +0200

batman-adv: fix tt_local_reset_flags() function

Currently the counter of tt_local_entry structures (tt_local_num) is incremented each time the tt_local_reset_flags() is invoked causing the node to send wrong TT_REPONSE packets containing a copy of non-initialised memory thus corrupting other nodes global translation table and making higher level communication impossible.

Reported-by: Junkeun Song jun361@gmail.com Signed-off-by: Antonio Quartulli ordex@autistici.org Acked-by: Junkeun Song jun361@gmail.com

diff --git a/translation-table.c b/translation-table.c index fb6931d..f599db9 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1668,6 +1668,8 @@ static void tt_local_reset_flags(struct bat_priv *bat_priv, uint16_t flags) rcu_read_lock(); hlist_for_each_entry_rcu(tt_local_entry, node, head, hash_entry) { + if (!(tt_local_entry->flags & flags)) + continue; tt_local_entry->flags &= ~flags; atomic_inc(&bat_priv->num_local_tt); }