mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
[NETFILTER]: x_tables: per-netns xt_tables
In fact all we want is per-netns set of rules, however doing that will unnecessary complicate routines such as ipt_hook()/ipt_do_table, so make full xt_table array per-netns. Every user stubbed with init_net for a while. Signed-off-by: Alexey Dobriyan <[email protected]> Signed-off-by: Patrick McHardy <[email protected]> Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
parent
a98da11d88
commit
8d87005207
7 changed files with 60 additions and 30 deletions
|
|
@ -870,7 +870,7 @@ static int get_info(void __user *user, int *len, int compat)
|
|||
if (compat)
|
||||
xt_compat_lock(NF_ARP);
|
||||
#endif
|
||||
t = try_then_request_module(xt_find_table_lock(NF_ARP, name),
|
||||
t = try_then_request_module(xt_find_table_lock(&init_net, NF_ARP, name),
|
||||
"arptable_%s", name);
|
||||
if (t && !IS_ERR(t)) {
|
||||
struct arpt_getinfo info;
|
||||
|
|
@ -926,7 +926,7 @@ static int get_entries(struct arpt_get_entries __user *uptr, int *len)
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
t = xt_find_table_lock(NF_ARP, get.name);
|
||||
t = xt_find_table_lock(&init_net, NF_ARP, get.name);
|
||||
if (t && !IS_ERR(t)) {
|
||||
struct xt_table_info *private = t->private;
|
||||
duprintf("t->private->number = %u\n",
|
||||
|
|
@ -966,7 +966,7 @@ static int __do_replace(const char *name, unsigned int valid_hooks,
|
|||
goto out;
|
||||
}
|
||||
|
||||
t = try_then_request_module(xt_find_table_lock(NF_ARP, name),
|
||||
t = try_then_request_module(xt_find_table_lock(&init_net, NF_ARP, name),
|
||||
"arptable_%s", name);
|
||||
if (!t || IS_ERR(t)) {
|
||||
ret = t ? PTR_ERR(t) : -ENOENT;
|
||||
|
|
@ -1132,7 +1132,7 @@ static int do_add_counters(void __user *user, unsigned int len, int compat)
|
|||
goto free;
|
||||
}
|
||||
|
||||
t = xt_find_table_lock(NF_ARP, name);
|
||||
t = xt_find_table_lock(&init_net, NF_ARP, name);
|
||||
if (!t || IS_ERR(t)) {
|
||||
ret = t ? PTR_ERR(t) : -ENOENT;
|
||||
goto free;
|
||||
|
|
@ -1604,7 +1604,7 @@ static int compat_get_entries(struct compat_arpt_get_entries __user *uptr,
|
|||
}
|
||||
|
||||
xt_compat_lock(NF_ARP);
|
||||
t = xt_find_table_lock(NF_ARP, get.name);
|
||||
t = xt_find_table_lock(&init_net, NF_ARP, get.name);
|
||||
if (t && !IS_ERR(t)) {
|
||||
struct xt_table_info *private = t->private;
|
||||
struct xt_table_info info;
|
||||
|
|
@ -1751,7 +1751,7 @@ int arpt_register_table(struct arpt_table *table,
|
|||
return ret;
|
||||
}
|
||||
|
||||
new_table = xt_register_table(table, &bootstrap, newinfo);
|
||||
new_table = xt_register_table(&init_net, table, &bootstrap, newinfo);
|
||||
if (IS_ERR(new_table)) {
|
||||
xt_free_table_info(newinfo);
|
||||
return PTR_ERR(new_table);
|
||||
|
|
|
|||
|
|
@ -1112,7 +1112,7 @@ static int get_info(void __user *user, int *len, int compat)
|
|||
if (compat)
|
||||
xt_compat_lock(AF_INET);
|
||||
#endif
|
||||
t = try_then_request_module(xt_find_table_lock(AF_INET, name),
|
||||
t = try_then_request_module(xt_find_table_lock(&init_net, AF_INET, name),
|
||||
"iptable_%s", name);
|
||||
if (t && !IS_ERR(t)) {
|
||||
struct ipt_getinfo info;
|
||||
|
|
@ -1170,7 +1170,7 @@ get_entries(struct ipt_get_entries __user *uptr, int *len)
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
t = xt_find_table_lock(AF_INET, get.name);
|
||||
t = xt_find_table_lock(&init_net, AF_INET, get.name);
|
||||
if (t && !IS_ERR(t)) {
|
||||
struct xt_table_info *private = t->private;
|
||||
duprintf("t->private->number = %u\n", private->number);
|
||||
|
|
@ -1208,7 +1208,7 @@ __do_replace(const char *name, unsigned int valid_hooks,
|
|||
goto out;
|
||||
}
|
||||
|
||||
t = try_then_request_module(xt_find_table_lock(AF_INET, name),
|
||||
t = try_then_request_module(xt_find_table_lock(&init_net, AF_INET, name),
|
||||
"iptable_%s", name);
|
||||
if (!t || IS_ERR(t)) {
|
||||
ret = t ? PTR_ERR(t) : -ENOENT;
|
||||
|
|
@ -1383,7 +1383,7 @@ do_add_counters(void __user *user, unsigned int len, int compat)
|
|||
goto free;
|
||||
}
|
||||
|
||||
t = xt_find_table_lock(AF_INET, name);
|
||||
t = xt_find_table_lock(&init_net, AF_INET, name);
|
||||
if (!t || IS_ERR(t)) {
|
||||
ret = t ? PTR_ERR(t) : -ENOENT;
|
||||
goto free;
|
||||
|
|
@ -1924,7 +1924,7 @@ compat_get_entries(struct compat_ipt_get_entries __user *uptr, int *len)
|
|||
}
|
||||
|
||||
xt_compat_lock(AF_INET);
|
||||
t = xt_find_table_lock(AF_INET, get.name);
|
||||
t = xt_find_table_lock(&init_net, AF_INET, get.name);
|
||||
if (t && !IS_ERR(t)) {
|
||||
struct xt_table_info *private = t->private;
|
||||
struct xt_table_info info;
|
||||
|
|
@ -2075,7 +2075,7 @@ int ipt_register_table(struct xt_table *table, const struct ipt_replace *repl)
|
|||
return ret;
|
||||
}
|
||||
|
||||
new_table = xt_register_table(table, &bootstrap, newinfo);
|
||||
new_table = xt_register_table(&init_net, table, &bootstrap, newinfo);
|
||||
if (IS_ERR(new_table)) {
|
||||
xt_free_table_info(newinfo);
|
||||
return PTR_ERR(new_table);
|
||||
|
|
|
|||
Loading…
Reference in a new issue