From: Jozsef Kadlecsik Date: Sun, 30 Nov 2014 18:56:56 +0000 (+0100) Subject: netfilter: ipset: Allocate the proper size of memory when /0 networks are supported X-Git-Tag: MMI-PSA29.97-13-9~11024^2~99^2~1 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=77b4311d207c3ed7260da840ba41afa8bd9ca24c;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git netfilter: ipset: Allocate the proper size of memory when /0 networks are supported Signed-off-by: Jozsef Kadlecsik Signed-off-by: Pablo Neira Ayuso --- diff --git a/net/netfilter/ipset/ip_set_hash_gen.h b/net/netfilter/ipset/ip_set_hash_gen.h index 8ef9135d8bb5..974ff386db0f 100644 --- a/net/netfilter/ipset/ip_set_hash_gen.h +++ b/net/netfilter/ipset/ip_set_hash_gen.h @@ -1101,8 +1101,7 @@ IPSET_TOKEN(HTYPE, _create)(struct net *net, struct ip_set *set, hsize = sizeof(*h); #ifdef IP_SET_HASH_WITH_NETS - hsize += sizeof(struct net_prefixes) * - (set->family == NFPROTO_IPV4 ? 32 : 128); + hsize += sizeof(struct net_prefixes) * NLEN(set->family); #endif h = kzalloc(hsize, GFP_KERNEL); if (!h)