diff options
| author | Sven Eckelmann <sven@narfation.org> | 2020-03-18 00:27:08 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-20 09:06:28 +0100 |
| commit | adaff59ee5f73bd9ee24c8155c7f8ca7f5f89fd1 (patch) | |
| tree | 2e1191d339c1714fdd5a8ad3d56ace301365815d | |
| parent | a91c6b957e464e9e1f3790c0bf62f9465efc18da (diff) | |
batman-adv: Free last_bonding_candidate on release of orig_node
commit cbef1e102003edb236c6b2319ab269ccef963731 upstream.
The orig_ifinfo reference counter for last_bonding_candidate in
batadv_orig_node has to be reduced when an originator node is released.
Otherwise the orig_ifinfo is leaked and the reference counter the netdevice
is not reduced correctly.
Fixes: f3b3d9018975 ("batman-adv: add bonding again")
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 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index ce9743aa8a14..ce5b991707d0 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -565,6 +565,7 @@ static void batadv_orig_node_release(struct batadv_orig_node *orig_node) struct batadv_neigh_node *neigh_node; struct batadv_orig_ifinfo *orig_ifinfo; struct batadv_orig_node_vlan *vlan; + struct batadv_orig_ifinfo *last_candidate; spin_lock_bh(&orig_node->neigh_list_lock); @@ -580,8 +581,14 @@ static void batadv_orig_node_release(struct batadv_orig_node *orig_node) hlist_del_rcu(&orig_ifinfo->list); batadv_orig_ifinfo_free_ref(orig_ifinfo); } + + last_candidate = orig_node->last_bonding_candidate; + orig_node->last_bonding_candidate = NULL; spin_unlock_bh(&orig_node->neigh_list_lock); + if (last_candidate) + batadv_orig_ifinfo_free_ref(last_candidate); + 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); |