Skip to content

Commit

Permalink
tipc: potential shift wrapping bug in map_set()
Browse files Browse the repository at this point in the history
"up_map" is a u64 type but we're not using the high 32 bits.

Fixes: 35c55c9 ('tipc: add neighbor monitoring framework')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Dan Carpenter authored and David S. Miller committed Jun 18, 2016
1 parent 8c0c07a commit 0350cb4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions net/tipc/monitor.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 0350cb4

Please sign in to comment.