Skip to content

Commit

Permalink
net: netlink: Fix multicast group storage allocation for families wit…
Browse files Browse the repository at this point in the history
…h more than one groups

Multicast groups are stored in global buffer. Check for needed buffer size
incorrectly compares buffer size to first id for family. This means that
for families with more than one mcast id one may allocate too small buffer
and end up writing rest of the groups to some unallocated memory. Fix the
buffer size check to compare allocated space to last mcast id for the
family.

Tested on ARM using kernel 3.14

Signed-off-by: Matti Vaittinen <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
Matti Vaittinen authored and davem330 committed Jan 12, 2016
1 parent 06928b3 commit ccdf6ce
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion net/netlink/genetlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ static int genl_allocate_reserve_groups(int n_groups, int *first_id)
}
}

if (id >= mc_groups_longs * BITS_PER_LONG) {
if (id + n_groups >= mc_groups_longs * BITS_PER_LONG) {
unsigned long new_longs = mc_groups_longs +
BITS_TO_LONGS(n_groups);
size_t nlen = new_longs * sizeof(unsigned long);
Expand Down

0 comments on commit ccdf6ce

Please sign in to comment.