32bit long variables stored in structures sent over the wire must report the big endian notation and must be correctly handled during read and write operations by means of htonl and ntohl.

Introduced by: 0853ec7fafe0a195754454832993c6b35e22b842 ("batman-adv: tvlv - gateway download/upload bandwidth container")

Signed-off-by: Antonio Quartulli ordex@autistici.org --- gateway_client.c | 24 +++++++++++++----------- gateway_common.c | 4 ++-- packet.h | 4 ++-- 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/gateway_client.c b/gateway_client.c index f00db73..973f02d 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -344,8 +344,10 @@ static void batadv_gw_node_add(struct batadv_priv *bat_priv, batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "Found new gateway %pM -> gw bandwidth: %u.%u/%u.%u MBit\n", orig_node->orig, - gateway->bandwidth_down / 10, gateway->bandwidth_down % 10, - gateway->bandwidth_up / 10, gateway->bandwidth_up % 10); + ntohl(gateway->bandwidth_down) / 10, + ntohl(gateway->bandwidth_down) % 10, + ntohl(gateway->bandwidth_up) / 10, + ntohl(gateway->bandwidth_up) % 10); }

/** @@ -399,8 +401,8 @@ void batadv_gw_node_update(struct batadv_priv *bat_priv, goto out; }

- if ((gw_node->bandwidth_down == gateway->bandwidth_down) && - (gw_node->bandwidth_up == gateway->bandwidth_up)) + if ((gw_node->bandwidth_down == ntohl(gateway->bandwidth_down)) && + (gw_node->bandwidth_up == ntohl(gateway->bandwidth_up))) goto out;

batadv_dbg(BATADV_DBG_BATMAN, bat_priv, @@ -410,16 +412,16 @@ void batadv_gw_node_update(struct batadv_priv *bat_priv, gw_node->bandwidth_down % 10, gw_node->bandwidth_up / 10, gw_node->bandwidth_up % 10, - gateway->bandwidth_down / 10, - gateway->bandwidth_down % 10, - gateway->bandwidth_up / 10, - gateway->bandwidth_up % 10); + ntohl(gateway->bandwidth_down) / 10, + ntohl(gateway->bandwidth_down) % 10, + ntohl(gateway->bandwidth_up) / 10, + ntohl(gateway->bandwidth_up) % 10);

- gw_node->bandwidth_down = gateway->bandwidth_down; - gw_node->bandwidth_up = gateway->bandwidth_up; + gw_node->bandwidth_down = ntohl(gateway->bandwidth_down); + gw_node->bandwidth_up = ntohl(gateway->bandwidth_up);

gw_node->deleted = 0; - if (gateway->bandwidth_down == 0) { + if (ntohl(gateway->bandwidth_down) == 0) { gw_node->deleted = jiffies; batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "Gateway %pM removed from gateway list\n", diff --git a/gateway_common.c b/gateway_common.c index 9904710..07fd877 100644 --- a/gateway_common.c +++ b/gateway_common.c @@ -202,8 +202,8 @@ static void batadv_gw_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv, gateway.bandwidth_up = 0; } else { gateway_ptr = tvlv_value; - gateway.bandwidth_down = ntohl(gateway_ptr->bandwidth_down); - gateway.bandwidth_up = ntohl(gateway_ptr->bandwidth_up); + gateway.bandwidth_down = gateway_ptr->bandwidth_down; + gateway.bandwidth_up = gateway_ptr->bandwidth_up; if ((gateway.bandwidth_down == 0) || (gateway.bandwidth_up == 0)) { gateway.bandwidth_down = 0; diff --git a/packet.h b/packet.h index 58fe4eb..559c738 100644 --- a/packet.h +++ b/packet.h @@ -372,8 +372,8 @@ struct batadv_tvlv_long { * @bandwidth_up: advertised uplink upload bandwidth */ struct batadv_tvlv_gateway_data { - uint32_t bandwidth_down; - uint32_t bandwidth_up; + __be32 bandwidth_down; + __be32 bandwidth_up; };

/**