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

On branch : maint

commit 41b38727749a94c1a65cf0f4be9bfe1cbaf0adeb Author: Linus Lüssing linus.luessing@web.de Date: Mon Jan 20 11:06:44 2014 +0100

batman-adv: fix potential kernel paging error for unicast transmissions

batadv_send_skb_prepare_unicast(_4addr) might reallocate the skb's data. If it does then our ethhdr pointer is not valid anymore in batadv_send_skb_unicast(), resulting in a kernel paging error.

Fixing this by refetching the ethhdr pointer after the potential reallocation.

Introduced by b46c60b9e1ee7a1909c542413a85875a750955d6 ("batman-adv: improve unicast packet (re)routing")

Signed-off-by: Linus Lüssing linus.luessing@web.de Acked-by: Antonio Quartulli antonio@meshcoding.com Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

41b38727749a94c1a65cf0f4be9bfe1cbaf0adeb send.c | 4 ++++ 1 file changed, 4 insertions(+)

diff --git a/send.c b/send.c index b0a3d76..2035bd9 100644 --- a/send.c +++ b/send.c @@ -281,6 +281,10 @@ static int batadv_send_skb_unicast(struct batadv_priv *bat_priv, goto out; }

+ /* skb->data might have been reallocated by + * batadv_send_skb_prepare_unicast{,_4addr}() + */ + ethhdr = eth_hdr(skb); unicast_packet = (struct batadv_unicast_packet *)skb->data;

/* inform the destination node that we are still missing a correct route