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

Commit 1adbfc43 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge 



Antonio Quartulli says:

====================
net: batman-adv 20160114

Included bugfixes:
- avoid freeing batadv_hardif_neigh_node when still in use in other contexts
- prevent lockdep splat in mcast_free during shutdown
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e752991a bab7c6c3

net/batman-adv/multicast.c

+2 −0
Original line number Diff line number Diff line
@@ -802,7 +802,9 @@ void batadv_mcast_free(struct batadv_priv *bat_priv) 
	batadv_tvlv_container_unregister(bat_priv, BATADV_TVLV_MCAST, 1);

	batadv_tvlv_handler_unregister(bat_priv, BATADV_TVLV_MCAST, 1);



	spin_lock_bh(&bat_priv->tt.commit_lock);

	batadv_mcast_mla_tt_retract(bat_priv, NULL);

	spin_unlock_bh(&bat_priv->tt.commit_lock);

}



/**

net/batman-adv/originator.c

+12 −6
Original line number Diff line number Diff line
@@ -211,10 +211,6 @@ static void batadv_hardif_neigh_free_rcu(struct rcu_head *rcu) 


	hardif_neigh = container_of(rcu, struct batadv_hardif_neigh_node, rcu);



	spin_lock_bh(&hardif_neigh->if_incoming->neigh_list_lock);

	hlist_del_init_rcu(&hardif_neigh->list);

	spin_unlock_bh(&hardif_neigh->if_incoming->neigh_list_lock);



	batadv_hardif_free_ref_now(hardif_neigh->if_incoming);

	kfree(hardif_neigh);

}
@@ -227,9 +223,14 @@ static void batadv_hardif_neigh_free_rcu(struct rcu_head *rcu) 
static void

batadv_hardif_neigh_free_now(struct batadv_hardif_neigh_node *hardif_neigh)

{

	if (atomic_dec_and_test(&hardif_neigh->refcount))

	if (atomic_dec_and_test(&hardif_neigh->refcount)) {

		spin_lock_bh(&hardif_neigh->if_incoming->neigh_list_lock);

		hlist_del_init_rcu(&hardif_neigh->list);

		spin_unlock_bh(&hardif_neigh->if_incoming->neigh_list_lock);



		batadv_hardif_neigh_free_rcu(&hardif_neigh->rcu);

	}

}



/**

 * batadv_hardif_neigh_free_ref - decrement the hardif neighbors refcounter
@@ -238,9 +239,14 @@ batadv_hardif_neigh_free_now(struct batadv_hardif_neigh_node *hardif_neigh) 
 */

void batadv_hardif_neigh_free_ref(struct batadv_hardif_neigh_node *hardif_neigh)

{

	if (atomic_dec_and_test(&hardif_neigh->refcount))

	if (atomic_dec_and_test(&hardif_neigh->refcount)) {

		spin_lock_bh(&hardif_neigh->if_incoming->neigh_list_lock);

		hlist_del_init_rcu(&hardif_neigh->list);

		spin_unlock_bh(&hardif_neigh->if_incoming->neigh_list_lock);



		call_rcu(&hardif_neigh->rcu, batadv_hardif_neigh_free_rcu);

	}

}



/**

 * batadv_neigh_node_free_rcu - free the neigh_node