Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbef1e10 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Simon Wunderlich
Browse files

batman-adv: Free last_bonding_candidate on release of orig_node 



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: f3b3d901 ("batman-adv: add bonding again")
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarMarek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: default avatarSimon Wunderlich <sw@simonwunderlich.de>
parent 15c2ed75

net/batman-adv/originator.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -766,6 +766,7 @@ static void batadv_orig_node_release(struct kref *ref) 
	struct batadv_orig_node *orig_node;

	struct batadv_orig_node *orig_node;

	struct batadv_orig_ifinfo *orig_ifinfo;

	struct batadv_orig_ifinfo *orig_ifinfo;

	struct batadv_orig_node_vlan *vlan;

	struct batadv_orig_node_vlan *vlan;

	struct batadv_orig_ifinfo *last_candidate;





	orig_node = container_of(ref, struct batadv_orig_node, refcount);

	orig_node = container_of(ref, struct batadv_orig_node, refcount);
@@ -783,8 +784,14 @@ static void batadv_orig_node_release(struct kref *ref) 
		hlist_del_rcu(&orig_ifinfo->list);

		hlist_del_rcu(&orig_ifinfo->list);

		batadv_orig_ifinfo_put(orig_ifinfo);

		batadv_orig_ifinfo_put(orig_ifinfo);

	}

	}



	last_candidate = orig_node->last_bonding_candidate;

	orig_node->last_bonding_candidate = NULL;

	spin_unlock_bh(&orig_node->neigh_list_lock);

	spin_unlock_bh(&orig_node->neigh_list_lock);





	if (last_candidate)

		batadv_orig_ifinfo_put(last_candidate);



	spin_lock_bh(&orig_node->vlan_list_lock);

	spin_lock_bh(&orig_node->vlan_list_lock);

	hlist_for_each_entry_safe(vlan, node_tmp, &orig_node->vlan_list, list) {

	hlist_for_each_entry_safe(vlan, node_tmp, &orig_node->vlan_list, list) {

		hlist_del_rcu(&vlan->list);

		hlist_del_rcu(&vlan->list);