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

Commit 709de13f authored by Simon Wunderlich's avatar Simon Wunderlich Committed by Antonio Quartulli
Browse files

batman-adv: fix removing neigh_ifinfo 



When an interface is removed separately, all neighbors need to be
checked if they have a neigh_ifinfo structure for that particular
interface. If that is the case, remove that ifinfo so any references to
a hard interface can be freed.

This is a regression introduced by
89652331
("batman-adv: split tq information in neigh_node struct")

Reported-by: default avatarAntonio Quartulli <antonio@open-mesh.com>
Signed-off-by: default avatarSimon Wunderlich <simon@open-mesh.com>
Signed-off-by: default avatarMarek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: default avatarAntonio Quartulli <antonio@meshcoding.com>
parent 7b955a9f

net/batman-adv/originator.c

+46 −0
Original line number Original line Diff line number Diff line
@@ -706,6 +706,47 @@ struct batadv_orig_node *batadv_orig_node_new(struct batadv_priv *bat_priv, 
	return NULL;

	return NULL;

}

}





/**

 * batadv_purge_neigh_ifinfo - purge obsolete ifinfo entries from neighbor

 * @bat_priv: the bat priv with all the soft interface information

 * @neigh: orig node which is to be checked

 */

static void

batadv_purge_neigh_ifinfo(struct batadv_priv *bat_priv,

			  struct batadv_neigh_node *neigh)

{

	struct batadv_neigh_ifinfo *neigh_ifinfo;

	struct batadv_hard_iface *if_outgoing;

	struct hlist_node *node_tmp;



	spin_lock_bh(&neigh->ifinfo_lock);



	/* for all ifinfo objects for this neighinator */

	hlist_for_each_entry_safe(neigh_ifinfo, node_tmp,

				  &neigh->ifinfo_list, list) {

		if_outgoing = neigh_ifinfo->if_outgoing;



		/* always keep the default interface */

		if (if_outgoing == BATADV_IF_DEFAULT)

			continue;



		/* don't purge if the interface is not (going) down */

		if ((if_outgoing->if_status != BATADV_IF_INACTIVE) &&

		    (if_outgoing->if_status != BATADV_IF_NOT_IN_USE) &&

		    (if_outgoing->if_status != BATADV_IF_TO_BE_REMOVED))

			continue;



		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,

			   "neighbor/ifinfo purge: neighbor %pM, iface: %s\n",

			   neigh->addr, if_outgoing->net_dev->name);



		hlist_del_rcu(&neigh_ifinfo->list);

		batadv_neigh_ifinfo_free_ref(neigh_ifinfo);

	}



	spin_unlock_bh(&neigh->ifinfo_lock);

}



/**

/**

 * batadv_purge_orig_ifinfo - purge obsolete ifinfo entries from originator

 * batadv_purge_orig_ifinfo - purge obsolete ifinfo entries from originator

 * @bat_priv: the bat priv with all the soft interface information

 * @bat_priv: the bat priv with all the soft interface information
@@ -805,6 +846,11 @@ batadv_purge_orig_neighbors(struct batadv_priv *bat_priv, 




			hlist_del_rcu(&neigh_node->list);

			hlist_del_rcu(&neigh_node->list);

			batadv_neigh_node_free_ref(neigh_node);

			batadv_neigh_node_free_ref(neigh_node);

		} else {

			/* only necessary if not the whole neighbor is to be

			 * deleted, but some interface has been removed.

			 */

			batadv_purge_neigh_ifinfo(bat_priv, neigh_node);

		}

		}

	}

	}