diff options
| author | Jozsef Kadlecsik <kadlec@netfilter.org> | 2021-07-14 12:37:07 +0200 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@netfilter.org> | 2021-07-14 12:40:49 +0200 |
| commit | 15932461c91e8aedf54e885d429b954b439605d2 (patch) | |
| tree | 23bed1696242969f326735a809da308b94ff5cd6 /kernel/net/netfilter/ipset/ip_set_hash_net.c | |
| parent | 578462f89dab9d91c38f74a93bc6855ced11ea3c (diff) | |
Limit the maximal range of consecutive elements to add/delete
The range size of consecutive elements were not limited. Thus one
could define a huge range which may result soft lockup errors due
to the long execution time. Now the range size is limited to 2^20
entries. Reported by Brad Spengler.
Signed-off-by: Jozsef Kadlecsik <kadlec@netfilter.org>
Diffstat (limited to 'kernel/net/netfilter/ipset/ip_set_hash_net.c')
| -rw-r--r-- | kernel/net/netfilter/ipset/ip_set_hash_net.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/net/netfilter/ipset/ip_set_hash_net.c b/kernel/net/netfilter/ipset/ip_set_hash_net.c index 54318dd..c2819c6 100644 --- a/kernel/net/netfilter/ipset/ip_set_hash_net.c +++ b/kernel/net/netfilter/ipset/ip_set_hash_net.c @@ -189,6 +189,8 @@ hash_net4_uadt(struct ip_set *set, struct nlattr *tb[], if (ip + UINT_MAX == ip_to) return -IPSET_ERR_HASH_RANGE; } + if ((ip_to - ip + 1)/(1<<(32 - e.cidr)) > IPSET_MAX_RANGE) + return -ERANGE; if (retried) ip = ntohl(h->next.ip); do { |