1 From c7d05ee2b60370392d9c7bb1b764fd36b5aec81b Mon Sep 17 00:00:00 2001
2 From: Antonio Quartulli <ordex@autistici.org>
3 Date: Thu, 14 Jun 2012 22:21:28 +0200
4 Subject: [PATCH] batman-adv: fix skb->data assignment
6 skb_linearize(skb) possibly rearranges the skb internal data and then changes
7 the skb->data pointer value. For this reason any other pointer in the code that
8 was assigned skb->data before invoking skb_linearise(skb) must be re-assigned.
10 In the current tt_query message handling code this is not done and therefore, in
11 case of skb linearization, the pointer used to handle the packet header ends up
12 in pointing to poisoned memory. The packet is then dropped but the
13 translation-table mechanism is corrupted.
15 Signed-off-by: Antonio Quartulli <ordex@autistici.org>
18 1 files changed, 2 insertions(+), 0 deletions(-)
20 diff --git a/routing.c b/routing.c
21 index 840e2c6..015471d 100644
24 @@ -617,6 +617,8 @@ int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if)
26 if (skb_linearize(skb) < 0)
28 + /* skb_linearize() possibly changed skb->data */
29 + tt_query = (struct tt_query_packet *)skb->data;
31 tt_len = tt_query->tt_data * sizeof(struct tt_change);