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>
[bwh: Backported to 3.16:
 - s/_put/_free_ref/
 - Adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
index 370c0acecda78c596bcc59dade16182b2a4cbb7c..9e6967a1f23eedc1c9fede06dde2ee7addc31810 100644 (file)
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@ -530,6 +530,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, *vlan_tmp;
+       struct batadv_orig_ifinfo *last_candidate;
 
        spin_lock_bh(&orig_node->neigh_list_lock);
 
@@ -545,8 +546,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);
        list_for_each_entry_safe(vlan, vlan_tmp, &orig_node->vlan_list, list) {
                list_del_rcu(&vlan->list);