projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[cascardo/linux.git]
/
net
/
netlink
/
genetlink.c
diff --git
a/net/netlink/genetlink.c
b/net/netlink/genetlink.c
index
8e63662
..
f830326
100644
(file)
--- 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);