From: Jo-Philipp Wich Date: Mon, 17 Oct 2011 12:25:38 +0000 (+0000) Subject: [backfire/packages] batman-adv: merge r28472 X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=ff3cfd21a111eb621127f3cb3bf4e32c42a3caee [backfire/packages] batman-adv: merge r28472 SVN-Revision: 28473 --- diff --git a/net/batman-adv/patches/batman-adv_fix_tt_local_reset_flags_function.patch b/net/batman-adv/patches/batman-adv_fix_tt_local_reset_flags_function.patch new file mode 100644 index 0000000000..3d0d51e15b --- /dev/null +++ b/net/batman-adv/patches/batman-adv_fix_tt_local_reset_flags_function.patch @@ -0,0 +1,31 @@ +From: Antonio Quartulli + +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 +Signed-off-by: Antonio Quartulli +Acked-by: Junkeun Song +--- + translation-table.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/translation-table.c b/translation-table.c +index 2d2cfc1..d4a3917 100644 +--- a/translation-table.c ++++ b/translation-table.c +@@ -1727,6 +1727,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); + } +-- +1.7.3.4 +