batman-adv: detect local excess vlans in TT request

If the local representation of the global TT table of one originator has
more VLAN entries than the respective TT update, there is some
inconsistency present. By detecting and reporting this inconsistency,
the global table gets updated and the excess VLAN will get removed in
the process.

Reported-by: Alessandro Bolletta <alessandro@mediaspot.net>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Acked-by: Antonio Quartulli <antonio@meshcoding.com>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index 4228b10c47ead06db9284997afc1899e181d6505..17822de78ba3ec34419a94ea4a8ac7ccd2d81dad 100644 (file)
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -2411,8 +2411,8 @@ static bool batadv_tt_global_check_crc(struct batadv_orig_node *orig_node,
 {
        struct batadv_tvlv_tt_vlan_data *tt_vlan_tmp;
        struct batadv_orig_node_vlan *vlan;
+       int i, orig_num_vlan;
        u32 crc;
-       int i;
 
        /* check if each received CRC matches the locally stored one */
        for (i = 0; i < num_vlan; i++) {
@@ -2438,6 +2438,18 @@ static bool batadv_tt_global_check_crc(struct batadv_orig_node *orig_node,
                        return false;
        }
 
+       /* check if any excess VLANs exist locally for the originator
+        * which are not mentioned in the TVLV from the originator.
+        */
+       rcu_read_lock();
+       orig_num_vlan = 0;
+       hlist_for_each_entry_rcu(vlan, &orig_node->vlan_list, list)
+               orig_num_vlan++;
+       rcu_read_unlock();
+
+       if (orig_num_vlan > num_vlan)
+               return false;
+
        return true;
 }