| commit | ddb5388ffd0ad75d07e7b78181a0b579824ba6f0 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Wed Jan 13 00:21:27 2016 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Wed Jan 13 00:21:27 2016 -0500 |
| tree | be1e2bd103c69d7bbace3fffd97bc3d714bbc3d7 | |
| parent | ccdf6ce6a8dba374668ae9b4d763e19903611c38 [diff] | |
| parent | 67990608c8b95d2b8ccc29932376ae73d5818727 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c index 8e63662..d3f6b06 100644 --- a/net/netlink/genetlink.c +++ b/net/netlink/genetlink.c
@@ -185,7 +185,7 @@ } } - 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);