3.16.39-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: Sven Eckelmann <[email protected]> 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 <[email protected]> Signed-off-by: Marek Lindner <[email protected]> Signed-off-by: Simon Wunderlich <[email protected]> [bwh: Backported to 3.16: - vlan_list is a list not an hlist - s/_put/_free_ref/] Signed-off-by: Ben Hutchings <[email protected]> --- net/batman-adv/originator.c | 8 ++++++++ 1 file changed, 8 insertions(+) --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -529,6 +529,7 @@ static void batadv_orig_node_release(str 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(str } 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);
