Commit bc44b781 authored by Matthias Schiffer's avatar Matthias Schiffer Committed by Simon Wunderlich

batman-adv: update data pointers after skb_cow()

batadv_check_unicast_ttvn() calls skb_cow(), so pointers into the SKB data
must be (re)set after calling it. The ethhdr variable is dropped
altogether.

Fixes: 7cdcf6dd ("batman-adv: add UNICAST_4ADDR packet type")
Signed-off-by: default avatarMatthias Schiffer <mschiffer@universe-factory.net>
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarSimon Wunderlich <sw@simonwunderlich.de>
parent 74c12c63
...@@ -968,14 +968,10 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, ...@@ -968,14 +968,10 @@ int batadv_recv_unicast_packet(struct sk_buff *skb,
struct batadv_orig_node *orig_node = NULL, *orig_node_gw = NULL; struct batadv_orig_node *orig_node = NULL, *orig_node_gw = NULL;
int check, hdr_size = sizeof(*unicast_packet); int check, hdr_size = sizeof(*unicast_packet);
enum batadv_subtype subtype; enum batadv_subtype subtype;
struct ethhdr *ethhdr;
int ret = NET_RX_DROP; int ret = NET_RX_DROP;
bool is4addr, is_gw; bool is4addr, is_gw;
unicast_packet = (struct batadv_unicast_packet *)skb->data; unicast_packet = (struct batadv_unicast_packet *)skb->data;
unicast_4addr_packet = (struct batadv_unicast_4addr_packet *)skb->data;
ethhdr = eth_hdr(skb);
is4addr = unicast_packet->packet_type == BATADV_UNICAST_4ADDR; is4addr = unicast_packet->packet_type == BATADV_UNICAST_4ADDR;
/* the caller function should have already pulled 2 bytes */ /* the caller function should have already pulled 2 bytes */
if (is4addr) if (is4addr)
...@@ -995,12 +991,14 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, ...@@ -995,12 +991,14 @@ int batadv_recv_unicast_packet(struct sk_buff *skb,
if (!batadv_check_unicast_ttvn(bat_priv, skb, hdr_size)) if (!batadv_check_unicast_ttvn(bat_priv, skb, hdr_size))
goto free_skb; goto free_skb;
unicast_packet = (struct batadv_unicast_packet *)skb->data;
/* packet for me */ /* packet for me */
if (batadv_is_my_mac(bat_priv, unicast_packet->dest)) { if (batadv_is_my_mac(bat_priv, unicast_packet->dest)) {
/* If this is a unicast packet from another backgone gw, /* If this is a unicast packet from another backgone gw,
* drop it. * drop it.
*/ */
orig_addr_gw = ethhdr->h_source; orig_addr_gw = eth_hdr(skb)->h_source;
orig_node_gw = batadv_orig_hash_find(bat_priv, orig_addr_gw); orig_node_gw = batadv_orig_hash_find(bat_priv, orig_addr_gw);
if (orig_node_gw) { if (orig_node_gw) {
is_gw = batadv_bla_is_backbone_gw(skb, orig_node_gw, is_gw = batadv_bla_is_backbone_gw(skb, orig_node_gw,
...@@ -1015,6 +1013,8 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, ...@@ -1015,6 +1013,8 @@ int batadv_recv_unicast_packet(struct sk_buff *skb,
} }
if (is4addr) { if (is4addr) {
unicast_4addr_packet =
(struct batadv_unicast_4addr_packet *)skb->data;
subtype = unicast_4addr_packet->subtype; subtype = unicast_4addr_packet->subtype;
batadv_dat_inc_counter(bat_priv, subtype); batadv_dat_inc_counter(bat_priv, subtype);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment