diff mbox

[maint,v2,1/4] batman-adv: Fix orig_node_vlan leak on orig_node_release

Message ID 1467310246-5820-1-git-send-email-sven@narfation.org (mailing list archive)
State Accepted, archived
Commit 719afd254e812c7ff8688ce79bebb7324ec438d6
Delegated to: Marek Lindner
Headers

Commit Message

Sven Eckelmann June 30, 2016, 6:10 p.m. UTC 
  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: 21a57f6e7a3b ("batman-adv: make the TT CRC logic VLAN specific")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
--
v2:
 - nothing changed
---
 net/batman-adv/originator.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Marek Lindner July 5, 2016, 9:18 a.m. UTC | #1 
On Thursday, June 30, 2016 20:10:46 Sven Eckelmann wrote:
> 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: 21a57f6e7a3b ("batman-adv: make the TT CRC logic VLAN specific")
> Signed-off-by: Sven Eckelmann <sven@narfation.org>
> --
> v2:
>  - nothing changed
> ---
>  net/batman-adv/originator.c | 8 ++++++++
>  1 file changed, 8 insertions(+)

Applied in revision 719afd2.

Thanks,
Marek
diff mbox

Patch

diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
index 8755e5c..40626b4 100644
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@ -786,6 +786,7 @@  static void batadv_orig_node_release(struct kref *ref)
 	struct batadv_neigh_node *neigh_node;
 	struct batadv_orig_node *orig_node;
 	struct batadv_orig_ifinfo *orig_ifinfo;
+	struct batadv_orig_node_vlan *vlan;
 
 	orig_node = container_of(ref, struct batadv_orig_node, refcount);
 
@@ -805,6 +806,13 @@  static void batadv_orig_node_release(struct kref *ref)
 	}
 	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_put(vlan);
+	}
+	spin_unlock_bh(&orig_node->vlan_list_lock);
+
 	/* Free nc_nodes */
 	batadv_nc_purge_orig(orig_node->bat_priv, orig_node, NULL);