|
@@ -29,6 +29,7 @@
|
|
|
#include <linux/skbuff.h>
|
|
|
#include <linux/inet.h>
|
|
|
#include <linux/slab.h>
|
|
|
+#include <linux/vmalloc.h>
|
|
|
#include <net/net_namespace.h>
|
|
|
#include <net/netns/generic.h>
|
|
|
|
|
@@ -310,6 +311,14 @@ out:
|
|
|
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,
|
|
|
const struct xt_recent_mtinfo_v1 *info)
|
|
|
{
|
|
@@ -322,6 +331,7 @@ static int recent_mt_check(const struct xt_mtchk_param *par,
|
|
|
#endif
|
|
|
unsigned int i;
|
|
|
int ret = -EINVAL;
|
|
|
+ size_t sz;
|
|
|
|
|
|
if (unlikely(!hash_rnd_inited)) {
|
|
|
get_random_bytes(&hash_rnd, sizeof(hash_rnd));
|
|
@@ -360,8 +370,11 @@ static int recent_mt_check(const struct xt_mtchk_param *par,
|
|
|
goto out;
|
|
|
}
|
|
|
|
|
|
- t = kzalloc(sizeof(*t) + sizeof(t->iphash[0]) * ip_list_hash_size,
|
|
|
- GFP_KERNEL);
|
|
|
+ sz = sizeof(*t) + sizeof(t->iphash[0]) * ip_list_hash_size;
|
|
|
+ if (sz <= PAGE_SIZE)
|
|
|
+ t = kzalloc(sz, GFP_KERNEL);
|
|
|
+ else
|
|
|
+ t = vzalloc(sz);
|
|
|
if (t == NULL) {
|
|
|
ret = -ENOMEM;
|
|
|
goto out;
|
|
@@ -377,14 +390,14 @@ static int recent_mt_check(const struct xt_mtchk_param *par,
|
|
|
uid = make_kuid(&init_user_ns, ip_list_uid);
|
|
|
gid = make_kgid(&init_user_ns, ip_list_gid);
|
|
|
if (!uid_valid(uid) || !gid_valid(gid)) {
|
|
|
- kfree(t);
|
|
|
+ recent_table_free(t);
|
|
|
ret = -EINVAL;
|
|
|
goto out;
|
|
|
}
|
|
|
pde = proc_create_data(t->name, ip_list_perms, recent_net->xt_recent,
|
|
|
&recent_mt_fops, t);
|
|
|
if (pde == NULL) {
|
|
|
- kfree(t);
|
|
|
+ recent_table_free(t);
|
|
|
ret = -ENOMEM;
|
|
|
goto out;
|
|
|
}
|
|
@@ -435,7 +448,7 @@ static void recent_mt_destroy(const struct xt_mtdtor_param *par)
|
|
|
remove_proc_entry(t->name, recent_net->xt_recent);
|
|
|
#endif
|
|
|
recent_table_flush(t);
|
|
|
- kfree(t);
|
|
|
+ recent_table_free(t);
|
|
|
}
|
|
|
mutex_unlock(&recent_mutex);
|
|
|
}
|