Skip to content

Commit

Permalink
batman-adv: Fix potentially broken skb network header access
Browse files Browse the repository at this point in the history
The two commits noted below added calls to ip_hdr() and ipv6_hdr(). They
need a correctly set skb network header.

Unfortunately we cannot rely on the device drivers to set it for us.
Therefore setting it in the beginning of the according ndo_start_xmit
handler.

Fixes: 1d8ab8d ("batman-adv: Modified forwarding behaviour for multicast packets")
Fixes: ab49886 ("batman-adv: Add IPv4 link-local/IPv6-ll-all-nodes multicast support")
Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
  • Loading branch information
Linus Lüssing authored and Antonio Quartulli committed Aug 14, 2015
1 parent 3f1e08d commit 53cf037
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion net/batman-adv/soft-interface.c
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ static int batadv_interface_tx(struct sk_buff *skb,
int gw_mode;
enum batadv_forw_mode forw_mode;
struct batadv_orig_node *mcast_single_orig = NULL;
int network_offset = ETH_HLEN;

if (atomic_read(&bat_priv->mesh_state) != BATADV_MESH_ACTIVE)
goto dropped;
Expand All @@ -214,14 +215,18 @@ static int batadv_interface_tx(struct sk_buff *skb,
case ETH_P_8021Q:
vhdr = vlan_eth_hdr(skb);

if (vhdr->h_vlan_encapsulated_proto != ethertype)
if (vhdr->h_vlan_encapsulated_proto != ethertype) {
network_offset += VLAN_HLEN;
break;
}

/* fall through */
case ETH_P_BATMAN:
goto dropped;
}

skb_set_network_header(skb, network_offset);

if (batadv_bla_tx(bat_priv, skb, vid))
goto dropped;

Expand Down

0 comments on commit 53cf037

Please sign in to comment.