Skip to contentSkip to conversation

tipc: potential shift wrapping bug in map_set()

PATCH Applied Dan Carpenter 3 participants 3 messages Jun 17, 2016 – Jun 18, 2016

Subsystems (4)
Networking Network drivers Kernel janitors TIPC network layer
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 tipc: potential shift wrapping bug in map_set()

"up_map" is a u64 type but we're not using the high 32 bits.

Fixes 35c55c9877f8 ('tipc: add neighbor monitoring framework')
Signed-off-by Dan Carpenter <[email protected]>
net/tipc/monitor.c +2 -2
index 87d4efe..0d489e8 100644
@@ -122,8 +122,8 @@ static int dom_size(int peers)
 
 static void map_set(u64 *up_map, int i, unsigned int v)
 {
-	*up_map &= ~(1 << i);
-	*up_map |= (v << i);
+	*up_map &= ~(1ULL << i);
+	*up_map |= ((u64)v << i);
 }
 
 static int map_get(u64 up_map, int i)
#1 lore raw

Acked. This will only be relevant in clusters > 1000 nodes, which I must admit I haven't tested yet.

///jon

Quoted 28 lines

-----Original Message-----
From: Dan Carpenter [mailto:[email protected]]
Sent: Friday, 17 June, 2016 05:22
To: Jon Maloy
Cc: Ying Xue; David S. Miller; [email protected]; tipc- [email protected]; [email protected]
Subject: [patch -next] tipc: potential shift wrapping bug in map_set()

"up_map" is a u64 type but we're not using the high 32 bits.

Fixes 35c55c9877f8 ('tipc: add neighbor monitoring framework')
Signed-off-by Dan Carpenter <[email protected]>
net/tipc/monitor.c +2 -2
index 87d4efe..0d489e8 100644
@@ -122,8 +122,8 @@ static int dom_size(int peers)
 
 static void map_set(u64 *up_map, int i, unsigned int v)
 {
-	*up_map &= ~(1 << i);
-	*up_map |= (v << i);
+	*up_map &= ~(1ULL << i);
+	*up_map |= ((u64)v << i);
 }
 
 static int map_get(u64 up_map, int i)