[linux-next] LinuxNextTracking branch, master, updated. next-20120620

batman at open-mesh.org batman at open-mesh.org
Thu Jun 21 00:17:00 CEST 2012

The following commit has been merged in the master branch:
commit 2c995ff892313009e336ecc8ec3411022f5b1c39
Author: Antonio Quartulli <ordex at autistici.org>
Date:   Tue Jun 19 09:26:39 2012 +0000

    batman-adv: fix skb->data assignment
    skb_linearize(skb) possibly rearranges the skb internal data and then changes
    the skb->data pointer value. For this reason any other pointer in the code that
    was assigned skb->data before invoking skb_linearise(skb) must be re-assigned.
    In the current tt_query message handling code this is not done and therefore, in
    case of skb linearization, the pointer used to handle the packet header ends up
    in pointing to free'd memory.
    This bug was introduced by a73105b8d4c765d9ebfb664d0a66802127d8e4c7
    (batman-adv: improved client announcement mechanism)
    Signed-off-by: Antonio Quartulli <ordex at autistici.org>
    Cc: <stable at vger.kernel.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index 840e2c6..015471d 100644
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -617,6 +617,8 @@ int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if)
 			 * changes */
 			if (skb_linearize(skb) < 0)
 				goto out;
+			/* skb_linearize() possibly changed skb->data */
+			tt_query = (struct tt_query_packet *)skb->data;
 			tt_len = tt_query->tt_data * sizeof(struct tt_change);


More information about the linux-merge mailing list