batman-adv: correctly set the data field in the TT_REPONSE packet
Antonio Quartulli [Mon, 17 Oct 2011 12:25:13 +0000 (14:25 +0200)]
commit 9d8523931f7f5eb8900077f0da0fbe6b8ad0010b upstream.

In the TT_RESPONSE packet, the number of carried entries is not correctly set.
This leads to a wrong interpretation of the packet payload on the receiver side
causing random entries to be added to the global translation table. Therefore
the latter gets always corrupted, triggering a table recovery all the time.

Signed-off-by: Antonio Quartulli <ordex@autistici.org>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

net/batman-adv/translation-table.c

index f599db9..ef1acfd 100644 (file)
@@ -999,7 +999,6 @@ static struct sk_buff *tt_response_fill_table(uint16_t tt_len, uint8_t ttvn,
        tt_response = (struct tt_query_packet *)skb_put(skb,
                                                     tt_query_size + tt_len);
        tt_response->ttvn = ttvn;
-       tt_response->tt_data = htons(tt_tot);
 
        tt_change = (struct tt_change *)(skb->data + tt_query_size);
        tt_count = 0;
@@ -1025,6 +1024,10 @@ static struct sk_buff *tt_response_fill_table(uint16_t tt_len, uint8_t ttvn,
        }
        rcu_read_unlock();
 
+       /* store in the message the number of entries we have successfully
+        * copied */
+       tt_response->tt_data = htons(tt_count);
+
 out:
        return skb;
 }