Commit 5ee41309 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Khalid Elmously

batman-adv: Fix DAT candidate selection on little endian systems

BugLink: https://bugs.launchpad.net/bugs/1860681

commit 4cc4a170 upstream.

The distributed arp table is using a DHT to store and retrieve MAC address
information for an IP address. This is done using unicast messages to
selected peers. The potential peers are looked up using the IP address and
the VID.

While the IP address is always stored in big endian byte order, this is not
the case of the VID. It can (depending on the host system) either be big
endian or little endian. The host must therefore always convert it to big
endian to ensure that all devices calculate the same peers for the same
lookup data.

Fixes: be1db4f6 ("batman-adv: make the Distributed ARP Table vlan aware")
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarSimon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarConnor Kuehl <connor.kuehl@canonical.com>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
parent b8022cbf
...@@ -226,6 +226,7 @@ static u32 batadv_hash_dat(const void *data, u32 size) ...@@ -226,6 +226,7 @@ static u32 batadv_hash_dat(const void *data, u32 size)
u32 hash = 0; u32 hash = 0;
const struct batadv_dat_entry *dat = data; const struct batadv_dat_entry *dat = data;
const unsigned char *key; const unsigned char *key;
__be16 vid;
u32 i; u32 i;
key = (const unsigned char *)&dat->ip; key = (const unsigned char *)&dat->ip;
...@@ -235,7 +236,8 @@ static u32 batadv_hash_dat(const void *data, u32 size) ...@@ -235,7 +236,8 @@ static u32 batadv_hash_dat(const void *data, u32 size)
hash ^= (hash >> 6); hash ^= (hash >> 6);
} }
key = (const unsigned char *)&dat->vid; vid = htons(dat->vid);
key = (__force const unsigned char *)&vid;
for (i = 0; i < sizeof(dat->vid); i++) { for (i = 0; i < sizeof(dat->vid); i++) {
hash += key[i]; hash += key[i];
hash += (hash << 10); hash += (hash << 10);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment