diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-01-13 00:22:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-01-13 00:22:03 -0500 |
| commit | ce78c76f33b9f43b92444869d1723f9e4260797a (patch) | |
| tree | 0abcedcc0e5eed5db44abb687876f12132254d40 /net | |
| parent | net: bnxt: always return values from _bnxt_get_max_rings (diff) | |
| parent | net: netlink: Fix multicast group storage allocation for families with more than one groups (diff) | |
| download | wireguard-linux-ce78c76f33b9f43b92444869d1723f9e4260797a.tar.xz wireguard-linux-ce78c76f33b9f43b92444869d1723f9e4260797a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net')
| -rw-r--r-- | net/netlink/genetlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c index 8e63662c6fb0..d3f6b063467b 100644 --- a/net/netlink/genetlink.c +++ b/net/netlink/genetlink.c @@ -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); |