projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8c0c07a
)
tipc: potential shift wrapping bug in map_set()
author
Dan Carpenter
<dan.carpenter@oracle.com>
Fri, 17 Jun 2016 09:22:26 +0000
(12:22 +0300)
committer
David S. Miller
<davem@davemloft.net>
Sat, 18 Jun 2016 04:26:03 +0000
(21:26 -0700)
"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@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/tipc/monitor.c
patch
|
blob
|
history
diff --git
a/net/tipc/monitor.c
b/net/tipc/monitor.c
index 87d4efedd09fd9768a925ac99d374c8ac6b78584..0d489e81fcca129dbb12f5c00390aad7014ef89e 100644
(file)
--- 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 &= ~(1
ULL
<< i);
+ *up_map |= (
(u64)
v << i);
}
static int map_get(u64 up_map, int i)