Skip to content

Commit 510841d

Browse files
Jozsef Kadlecsikummakynes
authored andcommitted
netfilter: ipset: enforce documented limit to prevent allocating huge memory
Daniel Xu reported that the hash:net,iface type of the ipset subsystem does not limit adding the same network with different interfaces to a set, which can lead to huge memory usage or allocation failure. The quick reproducer is $ ipset create ACL.IN.ALL_PERMIT hash:net,iface hashsize 1048576 timeout 0 $ for i in $(seq 0 100); do /sbin/ipset add ACL.IN.ALL_PERMIT 0.0.0.0/0,kaf_$i timeout 0 -exist; done The backtrace when vmalloc fails: [Tue Oct 25 00:13:08 2022] ipset: vmalloc error: size 1073741848, exceeds total pages <...> [Tue Oct 25 00:13:08 2022] Call Trace: [Tue Oct 25 00:13:08 2022] <TASK> [Tue Oct 25 00:13:08 2022] dump_stack_lvl+0x48/0x60 [Tue Oct 25 00:13:08 2022] warn_alloc+0x155/0x180 [Tue Oct 25 00:13:08 2022] __vmalloc_node_range+0x72a/0x760 [Tue Oct 25 00:13:08 2022] ? hash_netiface4_add+0x7c0/0xb20 [Tue Oct 25 00:13:08 2022] ? __kmalloc_large_node+0x4a/0x90 [Tue Oct 25 00:13:08 2022] kvmalloc_node+0xa6/0xd0 [Tue Oct 25 00:13:08 2022] ? hash_netiface4_resize+0x99/0x710 <...> The fix is to enforce the limit documented in the ipset(8) manpage: > The internal restriction of the hash:net,iface set type is that the same > network prefix cannot be stored with more than 64 different interfaces > in a single set. Fixes: ccf0a4b ("netfilter: ipset: Add bucketsize parameter to all hash types") Reported-by: Daniel Xu <[email protected]> Signed-off-by: Jozsef Kadlecsik <[email protected]> Signed-off-by: Pablo Neira Ayuso <[email protected]>
1 parent cbc1dd5 commit 510841d

File tree

1 file changed

+6
-24
lines changed

1 file changed

+6
-24
lines changed

net/netfilter/ipset/ip_set_hash_gen.h

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -42,31 +42,8 @@
4242
#define AHASH_MAX_SIZE (6 * AHASH_INIT_SIZE)
4343
/* Max muber of elements in the array block when tuned */
4444
#define AHASH_MAX_TUNED 64
45-
4645
#define AHASH_MAX(h) ((h)->bucketsize)
4746

48-
/* Max number of elements can be tuned */
49-
#ifdef IP_SET_HASH_WITH_MULTI
50-
static u8
51-
tune_bucketsize(u8 curr, u32 multi)
52-
{
53-
u32 n;
54-
55-
if (multi < curr)
56-
return curr;
57-
58-
n = curr + AHASH_INIT_SIZE;
59-
/* Currently, at listing one hash bucket must fit into a message.
60-
* Therefore we have a hard limit here.
61-
*/
62-
return n > curr && n <= AHASH_MAX_TUNED ? n : curr;
63-
}
64-
#define TUNE_BUCKETSIZE(h, multi) \
65-
((h)->bucketsize = tune_bucketsize((h)->bucketsize, multi))
66-
#else
67-
#define TUNE_BUCKETSIZE(h, multi)
68-
#endif
69-
7047
/* A hash bucket */
7148
struct hbucket {
7249
struct rcu_head rcu; /* for call_rcu */
@@ -936,7 +913,12 @@ mtype_add(struct ip_set *set, void *value, const struct ip_set_ext *ext,
936913
goto set_full;
937914
/* Create a new slot */
938915
if (n->pos >= n->size) {
939-
TUNE_BUCKETSIZE(h, multi);
916+
#ifdef IP_SET_HASH_WITH_MULTI
917+
if (h->bucketsize >= AHASH_MAX_TUNED)
918+
goto set_full;
919+
else if (h->bucketsize < multi)
920+
h->bucketsize += AHASH_INIT_SIZE;
921+
#endif
940922
if (n->size >= AHASH_MAX(h)) {
941923
/* Trigger rehashing */
942924
mtype_data_next(&h->next, d);

0 commit comments

Comments
 (0)