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

Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge 



Included changes:
- fix Ethernet header access by jumping the correct batman-adv header

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 09316255 dd981ab0

net/batman-adv/routing.c

+5 −6
Original line number Diff line number Diff line
@@ -924,7 +924,7 @@ batadv_reroute_unicast_packet(struct batadv_priv *bat_priv, 
}



static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv,

				     struct sk_buff *skb) {

				     struct sk_buff *skb, int hdr_len) {

	uint8_t curr_ttvn, old_ttvn;

	struct batadv_orig_node *orig_node;

	struct ethhdr *ethhdr;
@@ -933,7 +933,7 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, 
	int is_old_ttvn;



	/* check if there is enough data before accessing it */

	if (pskb_may_pull(skb, sizeof(*unicast_packet) + ETH_HLEN) < 0)

	if (pskb_may_pull(skb, hdr_len + ETH_HLEN) < 0)

		return 0;



	/* create a copy of the skb (in case of for re-routing) to modify it. */
@@ -941,7 +941,7 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, 
		return 0;



	unicast_packet = (struct batadv_unicast_packet *)skb->data;

	ethhdr = (struct ethhdr *)(skb->data + sizeof(*unicast_packet));

	ethhdr = (struct ethhdr *)(skb->data + hdr_len);



	/* check if the destination client was served by this node and it is now

	 * roaming. In this case, it means that the node has got a ROAM_ADV
@@ -1048,8 +1048,7 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, 


	if (batadv_check_unicast_packet(bat_priv, skb, hdr_size) < 0)

		return NET_RX_DROP;



	if (!batadv_check_unicast_ttvn(bat_priv, skb))

	if (!batadv_check_unicast_ttvn(bat_priv, skb, hdr_size))

		return NET_RX_DROP;



	/* packet for me */
@@ -1093,7 +1092,7 @@ int batadv_recv_ucast_frag_packet(struct sk_buff *skb, 
	if (batadv_check_unicast_packet(bat_priv, skb, hdr_size) < 0)

		return NET_RX_DROP;



	if (!batadv_check_unicast_ttvn(bat_priv, skb))

	if (!batadv_check_unicast_ttvn(bat_priv, skb, hdr_size))

		return NET_RX_DROP;



	unicast_packet = (struct batadv_unicast_frag_packet *)skb->data;