diff options
| author | Sven Eckelmann <sven@narfation.org> | 2020-03-18 00:27:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-20 09:06:27 +0100 |
| commit | 39c8ee0f5ff636b91e47118dbb8ce8f1527d9d1a (patch) | |
| tree | 2733006a4f4456ba258f51f8e58ed78f4d4d08c4 | |
| parent | beb16eb54af93151ebd28c467165d9b1663c10e2 (diff) | |
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/batman-adv/originator.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 71d0f6deb8aa..ce9743aa8a14 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -564,6 +564,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; spin_lock_bh(&orig_node->neigh_list_lock); @@ -581,6 +582,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); + hlist_for_each_entry_safe(vlan, node_tmp, &orig_node->vlan_list, list) { + hlist_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); |