Commit 4e192be1 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'batadv-net-pullrequest-20240201' of git://git.open-mesh.org/linux-merge 

Simon Wunderlich says:

====================
Here are some batman-adv bugfixes:

 - fix a timeout issue and a memory leak in batman-adv multicast,
   by Linus Lüssing (2 patches)

* tag 'batadv-net-pullrequest-20240201' of git://git.open-mesh.org/linux-merge:
  batman-adv: mcast: fix memory leak on deleting a batman-adv interface
  batman-adv: mcast: fix mcast packet type counter on timeouted nodes
====================

Link: https://lore.kernel.org/r/20240201110110.29129-1-sw@simonwunderlich.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 069a6ed2 0a186b49

net/batman-adv/multicast.c

+3 −0
Original line number Diff line number Diff line
@@ -2175,6 +2175,7 @@ void batadv_mcast_free(struct batadv_priv *bat_priv) 
	cancel_delayed_work_sync(&bat_priv->mcast.work);



	batadv_tvlv_container_unregister(bat_priv, BATADV_TVLV_MCAST, 2);

	batadv_tvlv_handler_unregister(bat_priv, BATADV_TVLV_MCAST_TRACKER, 1);

	batadv_tvlv_handler_unregister(bat_priv, BATADV_TVLV_MCAST, 2);



	/* safely calling outside of worker, as worker was canceled above */
@@ -2198,6 +2199,8 @@ void batadv_mcast_purge_orig(struct batadv_orig_node *orig) 
				      BATADV_MCAST_WANT_NO_RTR4);

	batadv_mcast_want_rtr6_update(bat_priv, orig,

				      BATADV_MCAST_WANT_NO_RTR6);

	batadv_mcast_have_mc_ptype_update(bat_priv, orig,

					  BATADV_MCAST_HAVE_MC_PTYPE_CAPA);



	spin_unlock_bh(&orig->mcast_handler_lock);

}