Commit 99408c42 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'batadv-net-for-davem-20200824' of git://git.open-mesh.org/linux-merge 



Simon Wunderlich says:

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

 - Avoid uninitialized memory access when handling DHCP, by Sven Eckelmann

 - Fix check for own OGM in OGM receive handler, by Linus Luessing

 - Fix netif_rx access for non-interrupt context in BLA, by Jussi Kivilinna
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 966b8266 279e89b2

net/batman-adv/bat_v_ogm.c

+6 −5
Original line number Diff line number Diff line
@@ -881,6 +881,12 @@ static void batadv_v_ogm_process(const struct sk_buff *skb, int ogm_offset, 
		   ntohl(ogm_packet->seqno), ogm_throughput, ogm_packet->ttl,

		   ogm_packet->version, ntohs(ogm_packet->tvlv_len));



	if (batadv_is_my_mac(bat_priv, ogm_packet->orig)) {

		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,

			   "Drop packet: originator packet from ourself\n");

		return;

	}



	/* If the throughput metric is 0, immediately drop the packet. No need

	 * to create orig_node / neigh_node for an unusable route.

	 */
@@ -1008,11 +1014,6 @@ int batadv_v_ogm_packet_recv(struct sk_buff *skb, 
	if (batadv_is_my_mac(bat_priv, ethhdr->h_source))

		goto free_skb;



	ogm_packet = (struct batadv_ogm2_packet *)skb->data;



	if (batadv_is_my_mac(bat_priv, ogm_packet->orig))

		goto free_skb;



	batadv_inc_counter(bat_priv, BATADV_CNT_MGMT_RX);

	batadv_add_counter(bat_priv, BATADV_CNT_MGMT_RX_BYTES,

			   skb->len + ETH_HLEN);

net/batman-adv/bridge_loop_avoidance.c

+4 −1
Original line number Diff line number Diff line
@@ -437,7 +437,10 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, u8 *mac, 
	batadv_add_counter(bat_priv, BATADV_CNT_RX_BYTES,

			   skb->len + ETH_HLEN);



	if (in_interrupt())

		netif_rx(skb);

	else

		netif_rx_ni(skb);

out:

	if (primary_if)

		batadv_hardif_put(primary_if);

net/batman-adv/gateway_client.c

+4 −2
Original line number Diff line number Diff line
@@ -703,8 +703,10 @@ batadv_gw_dhcp_recipient_get(struct sk_buff *skb, unsigned int *header_len, 


	chaddr_offset = *header_len + BATADV_DHCP_CHADDR_OFFSET;

	/* store the client address if the message is going to a client */

	if (ret == BATADV_DHCP_TO_CLIENT &&

	    pskb_may_pull(skb, chaddr_offset + ETH_ALEN)) {

	if (ret == BATADV_DHCP_TO_CLIENT) {

		if (!pskb_may_pull(skb, chaddr_offset + ETH_ALEN))

			return BATADV_DHCP_NO;



		/* check if the DHCP packet carries an Ethernet DHCP */

		p = skb->data + *header_len + BATADV_DHCP_HTYPE_OFFSET;

		if (*p != BATADV_DHCP_HTYPE_ETHERNET)