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

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

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: 7ea7b4a1 ("batman-adv: make the TT CRC logic VLAN specific")
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 60154a1e

net/batman-adv/originator.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -765,6 +765,7 @@ static void batadv_orig_node_release(struct kref *ref) 
	struct batadv_neigh_node *neigh_node;

	struct batadv_neigh_node *neigh_node;

	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;





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

	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_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 */

	/* Free nc_nodes */

	batadv_nc_purge_orig(orig_node->bat_priv, orig_node, NULL);

	batadv_nc_purge_orig(orig_node->bat_priv, orig_node, NULL);