Repository : ssh://git@open-mesh.org/batman-adv

On branch : maint

commit 02008ee7543a6da10b7d8c648701f031da034365 Author: Linus Lüssing linus.luessing@c0d3.blue Date: Tue Jun 30 23:45:26 2015 +0200

batman-adv: Fix potentially broken skb network header access

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: 405cc1e5 ("batman-adv: Modified forwarding behaviour for multicast packets") Fixes: 1c090349 ("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

02008ee7543a6da10b7d8c648701f031da034365 soft-interface.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/soft-interface.c b/soft-interface.c index 7841a4b..eb87fd9 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -178,6 +178,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; @@ -190,14 +191,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;