From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Fri, 3 Oct 2014 05:06:00 +0000 (+0200)
Subject: Allocate the proper size of memory when /0 networks are supported
X-Git-Tag: v6.24~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d029dcfce1aef964c7d910825ad7a756a6e4dbad;p=ipset

Allocate the proper size of memory when /0 networks are supported
---

diff --git a/kernel/net/netfilter/ipset/ip_set_hash_gen.h b/kernel/net/netfilter/ipset/ip_set_hash_gen.h
index e19105b..6580b7e 100644
--- a/kernel/net/netfilter/ipset/ip_set_hash_gen.h
+++ b/kernel/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)