Skip to content

Commit

Permalink
batman-adv: fix multicast counter when purging originators
Browse files Browse the repository at this point in the history
When purging an orig_node we should only decrease counter tracking the
number of nodes without multicast optimizations support if it was
increased through this orig_node before.

A not yet quite initialized orig_node (meaning it did not have its turn
in the mcast-tvlv handler so far) which gets purged would not adhere to
this and will lead to a counter imbalance.

Fixing this by adding a check whether the orig_node is mcast-initalized
before decreasing the counter in the mcast-orig_node-purging routine.

Introduced by 60432d7
("batman-adv: Announce new capability via multicast TVLV")

Reported-by: Tobias Hachmer <[email protected]>
Signed-off-by: Linus Lüssing <[email protected]>
Signed-off-by: Marek Lindner <[email protected]>
Signed-off-by: Antonio Quartulli <[email protected]>
  • Loading branch information
T-X authored and ordex committed Jan 6, 2015
1 parent e8829f0 commit a516488
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion net/batman-adv/multicast.c
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,8 @@ void batadv_mcast_purge_orig(struct batadv_orig_node *orig)
{
struct batadv_priv *bat_priv = orig->bat_priv;

if (!(orig->capabilities & BATADV_ORIG_CAPA_HAS_MCAST))
if (!(orig->capabilities & BATADV_ORIG_CAPA_HAS_MCAST) &&
orig->capa_initialized & BATADV_ORIG_CAPA_HAS_MCAST)
atomic_dec(&bat_priv->mcast.num_disabled);

batadv_mcast_want_unsnoop_update(bat_priv, orig, BATADV_NO_FLAGS);
Expand Down

0 comments on commit a516488

Please sign in to comment.