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

On branch : maint

commit be4385eacf30ad55a5cf4574768624ce8141a0c7 Author: Antonio Quartulli antonio@open-mesh.com Date: Tue Feb 11 17:05:06 2014 +0100

batman-adv: fix TT CRC computation by ensuring byte order

When computing the CRC on a 2byte variable the order of the bytes obviously alters the final result. This means that computing the CRC over the same value on two archs having different endianess leads to different numbers.

The global and local translation table CRC computation routine makes this mistake while processing the clients VIDs. The result is a continuous CRC mismatching between nodes having different endianess.

Fix this by converting the VID to Network Order before processing it. This guarantees that every node uses the same byte order.

Introduced by 21a57f6e7a3b4455dfe68ee07a7b901d9e7f200b ("batman-adv: make the TT CRC logic VLAN specific")

Reported-by: Russel Senior russell@personaltelco.net Signed-off-by: Antonio Quartulli antonio@open-mesh.com Tested-by: Russell Senior russell@personaltelco.net Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

be4385eacf30ad55a5cf4574768624ce8141a0c7 translation-table.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/translation-table.c b/translation-table.c index 05c2a9b..24e3267 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1961,6 +1961,7 @@ static uint32_t batadv_tt_global_crc(struct batadv_priv *bat_priv, struct hlist_head *head; uint32_t i, crc_tmp, crc = 0; uint8_t flags; + __be16 tmp_vid;

for (i = 0; i < hash->size; i++) { head = &hash->table[i]; @@ -1997,8 +1998,11 @@ static uint32_t batadv_tt_global_crc(struct batadv_priv *bat_priv, orig_node)) continue;

- crc_tmp = crc32c(0, &tt_common->vid, - sizeof(tt_common->vid)); + /* use network order to read the VID: this ensures that + * every node reads the bytes in the same order. + */ + tmp_vid = htons(tt_common->vid); + crc_tmp = crc32c(0, &tmp_vid, sizeof(tmp_vid));

/* compute the CRC on flags that have to be kept in sync * among nodes @@ -2032,6 +2036,7 @@ static uint32_t batadv_tt_local_crc(struct batadv_priv *bat_priv, struct hlist_head *head; uint32_t i, crc_tmp, crc = 0; uint8_t flags; + __be16 tmp_vid;

for (i = 0; i < hash->size; i++) { head = &hash->table[i]; @@ -2050,8 +2055,11 @@ static uint32_t batadv_tt_local_crc(struct batadv_priv *bat_priv, if (tt_common->flags & BATADV_TT_CLIENT_NEW) continue;

- crc_tmp = crc32c(0, &tt_common->vid, - sizeof(tt_common->vid)); + /* use network order to read the VID: this ensures that + * every node reads the bytes in the same order. + */ + tmp_vid = htons(tt_common->vid); + crc_tmp = crc32c(0, &tmp_vid, sizeof(tmp_vid));

/* compute the CRC on flags that have to be kept in sync * among nodes