Commit 2727de76 authored by Eric Dumazet's avatar Eric Dumazet Committed by Pablo Neira Ayuso

netfilter: xt_recent: avoid high order page allocations

xt_recent can try high order page allocations and this can fail.

iptables: page allocation failure: order:9, mode:0xc0d0

It also wastes about half the allocated space because of kmalloc()
power-of-two roundups and struct recent_table layout.

Use vmalloc() instead to save space and be less prone to allocation
errors when memory is fragmented.
Reported-by: default avatarMiroslav Kratochvil <exa.exa@gmail.com>
Reported-by: default avatarDave Jones <davej@redhat.com>
Reported-by: default avatarHarald Reindl <h.reindl@thelounge.net>
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 757ae316
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/inet.h> #include <linux/inet.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/vmalloc.h>
#include <net/net_namespace.h> #include <net/net_namespace.h>
#include <net/netns/generic.h> #include <net/netns/generic.h>
...@@ -310,6 +311,14 @@ recent_mt(const struct sk_buff *skb, struct xt_action_param *par) ...@@ -310,6 +311,14 @@ recent_mt(const struct sk_buff *skb, struct xt_action_param *par)
return ret; return ret;
} }
static void recent_table_free(void *addr)
{
if (is_vmalloc_addr(addr))
vfree(addr);
else
kfree(addr);
}
static int recent_mt_check(const struct xt_mtchk_param *par, static int recent_mt_check(const struct xt_mtchk_param *par,
const struct xt_recent_mtinfo_v1 *info) const struct xt_recent_mtinfo_v1 *info)
{ {
...@@ -322,6 +331,7 @@ static int recent_mt_check(const struct xt_mtchk_param *par, ...@@ -322,6 +331,7 @@ static int recent_mt_check(const struct xt_mtchk_param *par,
#endif #endif
unsigned int i; unsigned int i;
int ret = -EINVAL; int ret = -EINVAL;
size_t sz;
if (unlikely(!hash_rnd_inited)) { if (unlikely(!hash_rnd_inited)) {
get_random_bytes(&hash_rnd, sizeof(hash_rnd)); get_random_bytes(&hash_rnd, sizeof(hash_rnd));
...@@ -360,8 +370,11 @@ static int recent_mt_check(const struct xt_mtchk_param *par, ...@@ -360,8 +370,11 @@ static int recent_mt_check(const struct xt_mtchk_param *par,
goto out; goto out;
} }
t = kzalloc(sizeof(*t) + sizeof(t->iphash[0]) * ip_list_hash_size, sz = sizeof(*t) + sizeof(t->iphash[0]) * ip_list_hash_size;
GFP_KERNEL); if (sz <= PAGE_SIZE)
t = kzalloc(sz, GFP_KERNEL);
else
t = vzalloc(sz);
if (t == NULL) { if (t == NULL) {
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
...@@ -377,14 +390,14 @@ static int recent_mt_check(const struct xt_mtchk_param *par, ...@@ -377,14 +390,14 @@ static int recent_mt_check(const struct xt_mtchk_param *par,
uid = make_kuid(&init_user_ns, ip_list_uid); uid = make_kuid(&init_user_ns, ip_list_uid);
gid = make_kgid(&init_user_ns, ip_list_gid); gid = make_kgid(&init_user_ns, ip_list_gid);
if (!uid_valid(uid) || !gid_valid(gid)) { if (!uid_valid(uid) || !gid_valid(gid)) {
kfree(t); recent_table_free(t);
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} }
pde = proc_create_data(t->name, ip_list_perms, recent_net->xt_recent, pde = proc_create_data(t->name, ip_list_perms, recent_net->xt_recent,
&recent_mt_fops, t); &recent_mt_fops, t);
if (pde == NULL) { if (pde == NULL) {
kfree(t); recent_table_free(t);
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
} }
...@@ -435,7 +448,7 @@ static void recent_mt_destroy(const struct xt_mtdtor_param *par) ...@@ -435,7 +448,7 @@ static void recent_mt_destroy(const struct xt_mtdtor_param *par)
remove_proc_entry(t->name, recent_net->xt_recent); remove_proc_entry(t->name, recent_net->xt_recent);
#endif #endif
recent_table_flush(t); recent_table_flush(t);
kfree(t); recent_table_free(t);
} }
mutex_unlock(&recent_mutex); mutex_unlock(&recent_mutex);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment