batman-adv: Fix orig_node_vlan leak on orig_node_release

commit 33fbb1f3db87ce53da925b3e034b4dd446d483f8 upstream.

batadv_orig_node_new uses batadv_orig_node_vlan_new to allocate a new
batadv_orig_node_vlan and add it to batadv_orig_node::vlan_list. References
to this list have also to be cleaned when the batadv_orig_node is removed.

Fixes: 7ea7b4a14275 ("batman-adv: make the TT CRC logic VLAN specific")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
[bwh: Backported to 3.16:
 - vlan_list is a list not an hlist
 - s/_put/_free_ref/]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
index 6b4adf1810d37e94167922b08e08f33d44ba7fa6..370c0acecda78c596bcc59dade16182b2a4cbb7c 100644 (file)
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@ -529,6 +529,7 @@ static void batadv_orig_node_release(struct batadv_orig_node *orig_node)
        struct hlist_node *node_tmp;
        struct batadv_neigh_node *neigh_node;
        struct batadv_orig_ifinfo *orig_ifinfo;
+       struct batadv_orig_node_vlan *vlan, *vlan_tmp;
 
        spin_lock_bh(&orig_node->neigh_list_lock);
 
@@ -546,6 +547,13 @@ static void batadv_orig_node_release(struct batadv_orig_node *orig_node)
        }
        spin_unlock_bh(&orig_node->neigh_list_lock);
 
+       spin_lock_bh(&orig_node->vlan_list_lock);
+       list_for_each_entry_safe(vlan, vlan_tmp, &orig_node->vlan_list, list) {
+               list_del_rcu(&vlan->list);
+               batadv_orig_node_vlan_free_ref(vlan);
+       }
+       spin_unlock_bh(&orig_node->vlan_list_lock);
+
        /* Free nc_nodes */
        batadv_nc_purge_orig(orig_node->bat_priv, orig_node, NULL);