Skip to contentSkip to conversation

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

PATCH Applied Antonio Quartulli 3 participants 7 messages Feb 11, 2014 – Feb 15, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 batman-adv: fix TT CRC computation by ensuring byte order

From: Antonio Quartulli <[email protected]>

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")

---
 translation-table.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
translation-table.c +12 -4
index 05c2a9b..24e3267 100644
@@ -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
Signature · 1 line
1.8.5.3
#1 lore raw

PATCH 2/2 batman-adv: free skb on TVLV parsing success

From: Antonio Quartulli <[email protected]>

When the TVLV parsing routine succeed the skb is left untouched thus leading to a memory leak.

Fix this by consuming the skb in case of success.

Introduced by 0b6aa0d43767889eeda43a132cf5e73df4e63bf2 ("batman-adv: tvlv - basic infrastructure")

---
 routing.c | 2 ++
 1 file changed, 2 insertions(+)
routing.c +2 -0
index f7579d0..71bf698 100644
@@ -1063,6 +1063,8 @@ int batadv_recv_unicast_tvlv(struct sk_buff *skb,
 
 	if (ret != NET_RX_SUCCESS)
 		ret = batadv_route_unicast_packet(skb, recv_if);
+	else
+		consume_skb(skb);
 
 	return ret;
 }
Signature · 1 line
1.8.5.3
Tested-by on v1 2/2
#2 lore raw

Re: [B.A.T.M.A.N.] [PATCH maint 2/2] batman-adv: free skb on TVLV parsing success

From: Antonio Quartulli <[email protected]> When the TVLV parsing routine succeed the skb is left untouched thus leading to a memory leak.

Fix this by consuming the skb in case of success.

Introduced by 0b6aa0d43767889eeda43a132cf5e73df4e63bf2 ("batman-adv: tvlv - basic infrastructure")

---
 routing.c | 2 ++
 1 file changed, 2 insertions(+)
routing.c +2 -0
index f7579d0..71bf698 100644
@@ -1063,6 +1063,8 @@ int batadv_recv_unicast_tvlv(struct sk_buff *skb,
 
 	if (ret != NET_RX_SUCCESS)
 		ret = batadv_route_unicast_packet(skb, recv_if);
+	else
+		consume_skb(skb);
 
 	return ret;
 }
Signature · 8 lines
1.8.5.3




-- 
Russell Senior, President
[email protected]
#3 lore raw

Re: [B.A.T.M.A.N.] [PATCH maint 2/2] batman-adv: free skb on TVLV parsing success

In reply to Antonio Quartulli
Quoted 7 lines · On Tuesday 11 February 2014 17:05:07 Antonio Quartulli wrote:

From: Antonio Quartulli <[email protected]>

When the TVLV parsing routine succeed the skb is left untouched thus leading to a memory leak.

Fix this by consuming the skb in case of success.

Quoted 7 lines

Introduced by 0b6aa0d43767889eeda43a132cf5e73df4e63bf2 ("batman-adv: tvlv - basic infrastructure")

---
 routing.c | 2 ++
 1 file changed, 2 insertions(+)

Applied in revision 9289542.

Thanks,
Marek

#4 lore raw
In reply to Antonio Quartulli
Quoted 12 lines · Antonio Quartulli

From: Antonio Quartulli <[email protected]>

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.

Quoted 8 lines

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")

Both the patch are:

Signature · 1 line
Antonio Quartulli
#6 lore raw
In reply to Antonio Quartulli
Quoted 16 lines · On Tuesday 11 February 2014 17:05:06 Antonio Quartulli wrote:

From: Antonio Quartulli <[email protected]>

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.

Quoted 7 lines

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

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

Applied in revision be4385e.

Thanks,
Marek