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

Commit ebe24cea authored by Marek Lindner's avatar Marek Lindner Committed by Antonio Quartulli
Browse files

batman-adv: initialize ELP orig address on secondary interfaces 



This fix prevents nodes to wrongly create a 00:00:00:00:00:00 originator
which can potentially interfere with the rest of the neighbor statistics.

Fixes: d6f94d91 ("batman-adv: ELP - adding basic infrastructure")
Signed-off-by: default avatarMarek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: default avatarAntonio Quartulli <a@unstable.cc>
parent e123705e

net/batman-adv/bat_v.c

+10 −0
Original line number Diff line number Diff line
@@ -40,6 +40,16 @@ 


static void batadv_v_iface_activate(struct batadv_hard_iface *hard_iface)

{

	struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);

	struct batadv_hard_iface *primary_if;



	primary_if = batadv_primary_if_get_selected(bat_priv);



	if (primary_if) {

		batadv_v_elp_iface_activate(primary_if, hard_iface);

		batadv_hardif_put(primary_if);

	}



	/* B.A.T.M.A.N. V does not use any queuing mechanism, therefore it can

	 * set the interface as ACTIVE right away, without any risk of race

	 * condition

net/batman-adv/bat_v_elp.c

+22 −9
Original line number Diff line number Diff line
@@ -376,6 +376,27 @@ void batadv_v_elp_iface_disable(struct batadv_hard_iface *hard_iface) 
	hard_iface->bat_v.elp_skb = NULL;

}



/**

 * batadv_v_elp_iface_activate - update the ELP buffer belonging to the given

 *  hard-interface

 * @primary_iface: the new primary interface

 * @hard_iface: interface holding the to-be-updated buffer

 */

void batadv_v_elp_iface_activate(struct batadv_hard_iface *primary_iface,

				 struct batadv_hard_iface *hard_iface)

{

	struct batadv_elp_packet *elp_packet;

	struct sk_buff *skb;



	if (!hard_iface->bat_v.elp_skb)

		return;



	skb = hard_iface->bat_v.elp_skb;

	elp_packet = (struct batadv_elp_packet *)skb->data;

	ether_addr_copy(elp_packet->orig,

			primary_iface->net_dev->dev_addr);

}



/**

 * batadv_v_elp_primary_iface_set - change internal data to reflect the new

 *  primary interface
@@ -384,8 +405,6 @@ void batadv_v_elp_iface_disable(struct batadv_hard_iface *hard_iface) 
void batadv_v_elp_primary_iface_set(struct batadv_hard_iface *primary_iface)

{

	struct batadv_hard_iface *hard_iface;

	struct batadv_elp_packet *elp_packet;

	struct sk_buff *skb;



	/* update orig field of every elp iface belonging to this mesh */

	rcu_read_lock();
@@ -393,13 +412,7 @@ void batadv_v_elp_primary_iface_set(struct batadv_hard_iface *primary_iface) 
		if (primary_iface->soft_iface != hard_iface->soft_iface)

			continue;



		if (!hard_iface->bat_v.elp_skb)

			continue;



		skb = hard_iface->bat_v.elp_skb;

		elp_packet = (struct batadv_elp_packet *)skb->data;

		ether_addr_copy(elp_packet->orig,

				primary_iface->net_dev->dev_addr);

		batadv_v_elp_iface_activate(primary_iface, hard_iface);

	}

	rcu_read_unlock();

}

net/batman-adv/bat_v_elp.h

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ struct work_struct; 


int batadv_v_elp_iface_enable(struct batadv_hard_iface *hard_iface);

void batadv_v_elp_iface_disable(struct batadv_hard_iface *hard_iface);

void batadv_v_elp_iface_activate(struct batadv_hard_iface *primary_iface,

				 struct batadv_hard_iface *hard_iface);

void batadv_v_elp_primary_iface_set(struct batadv_hard_iface *primary_iface);

int batadv_v_elp_packet_recv(struct sk_buff *skb,

			     struct batadv_hard_iface *if_incoming);