1 files changed, 12 insertions, 4 deletions

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index c21c5572c860..959dde721c46 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -1975,6 +1975,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];
@@ -2011,8 +2012,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
@@ -2046,6 +2050,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];
@@ -2064,8 +2069,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