[linux-next] LinuxNextTracking branch, master, updated. next-20111025

batman at open-mesh.org batman at open-mesh.org
Wed Oct 26 00:18:45 CEST 2011


The following commit has been merged in the master branch:
commit 31901264511cf20c5ed33b8649a3ca9ce28df60b
Author: Antonio Quartulli <ordex at 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 at gmail.com>
    Signed-off-by: Antonio Quartulli <ordex at autistici.org>
    Acked-by: Junkeun Song <jun361 at gmail.com>
    Signed-off-by: Marek Lindner <lindner_marek at yahoo.de>

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index fb6931d..f599db9 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/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);
 		}

-- 
LinuxNextTracking


More information about the linux-merge mailing list