diff mbox

[maint,v2,4/4] batman-adv: Free last_bonding_candidate on release of orig_node

Message ID 1467315673-9950-1-git-send-email-sven@narfation.org (mailing list archive)
State Accepted, archived
Commit 20df5c53865a90095099f0af80536b8abfea303b
Delegated to: Marek Lindner
Headers

Commit Message

Sven Eckelmann June 30, 2016, 7:41 p.m. UTC 
  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: 797edd9e87ac ("batman-adv: add bonding again")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
v2:
 - added new patch
---
 net/batman-adv/originator.c | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Marek Lindner July 5, 2016, 9:34 a.m. UTC | #1 
On Thursday, June 30, 2016 21:41:13 Sven Eckelmann wrote:
> 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: 797edd9e87ac ("batman-adv: add bonding again")
> Signed-off-by: Sven Eckelmann <sven@narfation.org>
> ---
> v2:
>  - added new patch
> ---
>  net/batman-adv/originator.c | 7 +++++++
>  1 file changed, 7 insertions(+)

Applied in revision 20df5c5.

Thanks,
Marek
diff mbox

Patch

diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
index 40626b4..8208276 100644
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@ -787,6 +787,7 @@  static void batadv_orig_node_release(struct kref *ref)
 	struct batadv_orig_node *orig_node;
 	struct batadv_orig_ifinfo *orig_ifinfo;
 	struct batadv_orig_node_vlan *vlan;
+	struct batadv_orig_ifinfo *last_candidate;
 
 	orig_node = container_of(ref, struct batadv_orig_node, refcount);
 
@@ -804,8 +805,14 @@  static void batadv_orig_node_release(struct kref *ref)
 		hlist_del_rcu(&orig_ifinfo->list);
 		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);
 
+	if (last_candidate)
+		batadv_orig_ifinfo_put(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);