Skip to contentSkip to conversation

batman-adv: bla: fix type misuse for backbone_gw hash indexing

PATCH New Linus Lüssing 1 participant 1 message Aug 27, 2020 Batman advanced

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 batman-adv: bla: fix type misuse for backbone_gw hash indexing

From: Linus Lüssing <[email protected]>

It seems that due to a copy & paste error the void pointer in batadv_choose_backbone_gw() is cast to the wrong type.

Fixing this by using "struct batadv_bla_backbone_gw" instead of "struct batadv_bla_claim" which better matches the caller's side.

For now it seems that we were lucky because the two structs both have their orig/vid and addr/vid in the beginning. However I stumbled over this issue when I was trying to add some debug variables in front of "orig" in batadv_backbone_gw, which caused hash lookups to fail.

Fixes 7e15c9305ce0 ("batman-adv: don't rely on positions in struct for hashing")
---
 net/batman-adv/bridge_loop_avoidance.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
net/batman-adv/bridge_loop_avoidance.c +4 -3
index b643dadc..4ba984bf 100644
@@ -88,11 +88,12 @@ static inline u32 batadv_choose_claim(const void *data, u32 size)
  */
 static inline u32 batadv_choose_backbone_gw(const void *data, u32 size)
 {
-	const struct batadv_bla_claim *claim = (struct batadv_bla_claim *)data;
+	const struct batadv_bla_backbone_gw *gw;
 	u32 hash = 0;
 
-	hash = jhash(&claim->addr, sizeof(claim->addr), hash);
-	hash = jhash(&claim->vid, sizeof(claim->vid), hash);
+	gw = (struct batadv_bla_backbone_gw *)data;
+	hash = jhash(&gw->orig, sizeof(gw->orig), hash);
+	hash = jhash(&gw->vid, sizeof(gw->vid), hash);
 
 	return hash % size;
 }
Signature · 1 line
2.28.0.rc1