[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20160617092226.GD25609@mwanda>
Date: Fri, 17 Jun 2016 12:22:26 +0300
From: Dan Carpenter <dan.carpenter@...cle.com>
To: Jon Maloy <jon.maloy@...csson.com>
Cc: Ying Xue <ying.xue@...driver.com>,
"David S. Miller" <davem@...emloft.net>, netdev@...r.kernel.org,
tipc-discussion@...ts.sourceforge.net,
kernel-janitors@...r.kernel.org
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 <dan.carpenter@...cle.com>
diff --git a/net/tipc/monitor.c b/net/tipc/monitor.c
index 87d4efe..0d489e8 100644
--- a/net/tipc/monitor.c
+++ b/net/tipc/monitor.c
@@ -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)
Powered by blists - more mailing lists