batman-adv: Fix ICMP RR ethernet access after skb_linearize
authorSven Eckelmann <sven@narfation.org>
Sun, 26 Jun 2016 09:16:12 +0000 (11:16 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 29 Jun 2016 08:01:48 +0000 (04:01 -0400)
commit3b55e4422087f9f7b241031d758a0c65584e4297
tree4e5911b53be006d88af805e05eb1e2b6cf6b1535
parentbaceced93274ff2f846eae991664f9094425ffa8
batman-adv: Fix ICMP RR ethernet access after skb_linearize

The skb_linearize may reallocate the skb. This makes the calculated pointer
for ethhdr invalid. But it the pointer is used later to fill in the RR
field of the batadv_icmp_packet_rr packet.

Instead re-evaluate eth_hdr after the skb_linearize+skb_cow to fix the
pointer and avoid the invalid read.

Fixes: da6b8c20a5b8 ("batman-adv: generalize batman-adv icmp packet handling")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/batman-adv/routing.c