44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
From: Sven Eckelmann <sven@narfation.org>
|
|
Date: Thu, 30 Jun 2016 20:10:46 +0200
|
|
Subject: [PATCH] batman-adv: Fix orig_node_vlan leak on orig_node_release
|
|
|
|
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>
|
|
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
|
|
|
|
Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/719afd254e812c7ff8688ce79bebb7324ec438d6
|
|
---
|
|
net/batman-adv/originator.c | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
|
|
index 7f51bc2..fe2fcda 100644
|
|
--- a/net/batman-adv/originator.c
|
|
+++ b/net/batman-adv/originator.c
|
|
@@ -765,6 +765,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);
|
|
|
|
@@ -784,6 +785,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);
|
|
|