diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2016-06-17 12:22:26 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-17 21:26:03 -0700 |
| commit | 0350cb48fb94e168d8b4d3ff65adbdbc73759cbf (patch) | |
| tree | ee87be64cf456d4c7cd92ea861cfd7f04204271b /net/tipc | |
| parent | 8c0c07a3fcf824d39aed92f5e4e18ef9643dceff (diff) | |
| download | blackbird-obmc-linux-0350cb48fb94e168d8b4d3ff65adbdbc73759cbf.tar.gz blackbird-obmc-linux-0350cb48fb94e168d8b4d3ff65adbdbc73759cbf.zip | |
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@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/monitor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/monitor.c b/net/tipc/monitor.c index 87d4efedd09f..0d489e81fcca 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) |
