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

Commit c2d8b9a6 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Simon Wunderlich
Browse files

batman-adv: Adjust name for batadv_dat_send_data 



The send functions in batman-adv are expected to consume the skb when
either the data is queued up for the underlying driver or when some
precondition failed. batadv_dat_send_data didn't do this and instead
created a copy of the skb, modified it and queued the copy up for
transmission. The caller has to take care that the skb is handled correctly
(for example free'd) when batadv_dat_send_data returns.

This unclear behavior already lead to memory leaks in the recent past.
Renaming the function to batadv_dat_forward_data should make it easier to
identify that the data is forwarded but the skb is not actually
send+consumed.

Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarSimon Wunderlich <sw@simonwunderlich.de>
parent cedb0dbb

net/batman-adv/distributed-arp-table.c

+14 −10
Original line number Diff line number Diff line
@@ -655,7 +655,7 @@ batadv_dat_select_candidates(struct batadv_priv *bat_priv, __be32 ip_dst, 
}



/**

 * batadv_dat_send_data() - send a payload to the selected candidates

 * batadv_dat_forward_data() - copy and send payload to the selected candidates

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

 * @skb: payload to send

 * @ip: the DHT key
@@ -668,7 +668,7 @@ batadv_dat_select_candidates(struct batadv_priv *bat_priv, __be32 ip_dst, 
 * Return: true if the packet is sent to at least one candidate, false

 * otherwise.

 */

static bool batadv_dat_send_data(struct batadv_priv *bat_priv,

static bool batadv_dat_forward_data(struct batadv_priv *bat_priv,

				    struct sk_buff *skb, __be32 ip,

				    unsigned short vid, int packet_subtype)

{
@@ -1265,7 +1265,7 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv, 
		ret = true;

	} else {

		/* Send the request to the DHT */

		ret = batadv_dat_send_data(bat_priv, skb, ip_dst, vid,

		ret = batadv_dat_forward_data(bat_priv, skb, ip_dst, vid,

					      BATADV_P_DAT_DHT_GET);

	}

out:
@@ -1380,8 +1380,10 @@ void batadv_dat_snoop_outgoing_arp_reply(struct batadv_priv *bat_priv, 
	/* Send the ARP reply to the candidates for both the IP addresses that

	 * the node obtained from the ARP reply

	 */

	batadv_dat_send_data(bat_priv, skb, ip_src, vid, BATADV_P_DAT_DHT_PUT);

	batadv_dat_send_data(bat_priv, skb, ip_dst, vid, BATADV_P_DAT_DHT_PUT);

	batadv_dat_forward_data(bat_priv, skb, ip_src, vid,

				BATADV_P_DAT_DHT_PUT);

	batadv_dat_forward_data(bat_priv, skb, ip_dst, vid,

				BATADV_P_DAT_DHT_PUT);

}



/**
@@ -1696,8 +1698,10 @@ static void batadv_dat_put_dhcp(struct batadv_priv *bat_priv, u8 *chaddr, 
	batadv_dat_entry_add(bat_priv, yiaddr, chaddr, vid);

	batadv_dat_entry_add(bat_priv, ip_dst, hw_dst, vid);



	batadv_dat_send_data(bat_priv, skb, yiaddr, vid, BATADV_P_DAT_DHT_PUT);

	batadv_dat_send_data(bat_priv, skb, ip_dst, vid, BATADV_P_DAT_DHT_PUT);

	batadv_dat_forward_data(bat_priv, skb, yiaddr, vid,

				BATADV_P_DAT_DHT_PUT);

	batadv_dat_forward_data(bat_priv, skb, ip_dst, vid,

				BATADV_P_DAT_DHT_PUT);



	consume_skb(skb);