|
|
|
@ -540,7 +540,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
genmask);
|
|
|
|
|
if (IS_ERR(table))
|
|
|
|
|
return PTR_ERR(table);
|
|
|
|
|
@@ -1581,7 +1489,6 @@ static int nf_tables_newchain(struct net
|
|
|
|
|
@@ -1597,7 +1505,6 @@ static int nf_tables_newchain(struct net
|
|
|
|
|
const struct nlattr * uninitialized_var(name);
|
|
|
|
|
u8 genmask = nft_genmask_next(net);
|
|
|
|
|
int family = nfmsg->nfgen_family;
|
|
|
|
@ -548,7 +548,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
struct nft_table *table;
|
|
|
|
|
struct nft_chain *chain;
|
|
|
|
|
u8 policy = NF_ACCEPT;
|
|
|
|
|
@@ -1591,11 +1498,7 @@ static int nf_tables_newchain(struct net
|
|
|
|
|
@@ -1607,11 +1514,7 @@ static int nf_tables_newchain(struct net
|
|
|
|
|
|
|
|
|
|
create = nlh->nlmsg_flags & NLM_F_CREATE ? true : false;
|
|
|
|
|
|
|
|
|
@ -561,7 +561,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
genmask);
|
|
|
|
|
if (IS_ERR(table))
|
|
|
|
|
return PTR_ERR(table);
|
|
|
|
|
@@ -1636,7 +1539,7 @@ static int nf_tables_newchain(struct net
|
|
|
|
|
@@ -1652,7 +1555,7 @@ static int nf_tables_newchain(struct net
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -570,7 +570,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
|
|
if (chain != NULL) {
|
|
|
|
|
if (nlh->nlmsg_flags & NLM_F_EXCL)
|
|
|
|
|
@@ -1657,7 +1560,6 @@ static int nf_tables_delchain(struct net
|
|
|
|
|
@@ -1673,7 +1576,6 @@ static int nf_tables_delchain(struct net
|
|
|
|
|
{
|
|
|
|
|
const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
|
|
|
|
|
u8 genmask = nft_genmask_next(net);
|
|
|
|
@ -578,7 +578,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
struct nft_table *table;
|
|
|
|
|
struct nft_chain *chain;
|
|
|
|
|
struct nft_rule *rule;
|
|
|
|
|
@@ -1666,11 +1568,7 @@ static int nf_tables_delchain(struct net
|
|
|
|
|
@@ -1682,11 +1584,7 @@ static int nf_tables_delchain(struct net
|
|
|
|
|
u32 use;
|
|
|
|
|
int err;
|
|
|
|
|
|
|
|
|
@ -591,7 +591,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
genmask);
|
|
|
|
|
if (IS_ERR(table))
|
|
|
|
|
return PTR_ERR(table);
|
|
|
|
|
@@ -1683,7 +1581,7 @@ static int nf_tables_delchain(struct net
|
|
|
|
|
@@ -1699,7 +1597,7 @@ static int nf_tables_delchain(struct net
|
|
|
|
|
chain->use > 0)
|
|
|
|
|
return -EBUSY;
|
|
|
|
|
|
|
|
|
@ -600,7 +600,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
|
|
use = chain->use;
|
|
|
|
|
list_for_each_entry(rule, &chain->rules, list) {
|
|
|
|
|
@@ -2107,7 +2005,7 @@ static int nf_tables_dump_rules(struct s
|
|
|
|
|
@@ -2123,7 +2021,7 @@ static int nf_tables_dump_rules(struct s
|
|
|
|
|
cb->seq = net->nft.base_seq;
|
|
|
|
|
|
|
|
|
|
list_for_each_entry_rcu(table, &net->nft.tables, list) {
|
|
|
|
@ -609,7 +609,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
if (ctx && ctx->table && strcmp(ctx->table, table->name) != 0)
|
|
|
|
|
@@ -2130,7 +2028,7 @@ static int nf_tables_dump_rules(struct s
|
|
|
|
|
@@ -2146,7 +2044,7 @@ static int nf_tables_dump_rules(struct s
|
|
|
|
|
cb->nlh->nlmsg_seq,
|
|
|
|
|
NFT_MSG_NEWRULE,
|
|
|
|
|
NLM_F_MULTI | NLM_F_APPEND,
|
|
|
|
@ -618,7 +618,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
table, chain, rule) < 0)
|
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
|
|
@@ -2166,7 +2064,6 @@ static int nf_tables_getrule(struct net
|
|
|
|
|
@@ -2182,7 +2080,6 @@ static int nf_tables_getrule(struct net
|
|
|
|
|
{
|
|
|
|
|
const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
|
|
|
|
|
u8 genmask = nft_genmask_cur(net);
|
|
|
|
@ -626,7 +626,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
const struct nft_table *table;
|
|
|
|
|
const struct nft_chain *chain;
|
|
|
|
|
const struct nft_rule *rule;
|
|
|
|
|
@@ -2210,11 +2107,7 @@ static int nf_tables_getrule(struct net
|
|
|
|
|
@@ -2226,11 +2123,7 @@ static int nf_tables_getrule(struct net
|
|
|
|
|
return netlink_dump_start(nlsk, skb, nlh, &c);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -639,7 +639,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
genmask);
|
|
|
|
|
if (IS_ERR(table))
|
|
|
|
|
return PTR_ERR(table);
|
|
|
|
|
@@ -2279,7 +2172,7 @@ static int nf_tables_newrule(struct net
|
|
|
|
|
@@ -2295,7 +2188,7 @@ static int nf_tables_newrule(struct net
|
|
|
|
|
{
|
|
|
|
|
const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
|
|
|
|
|
u8 genmask = nft_genmask_next(net);
|
|
|
|
@ -648,7 +648,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
struct nft_table *table;
|
|
|
|
|
struct nft_chain *chain;
|
|
|
|
|
struct nft_rule *rule, *old_rule = NULL;
|
|
|
|
|
@@ -2295,11 +2188,7 @@ static int nf_tables_newrule(struct net
|
|
|
|
|
@@ -2311,11 +2204,7 @@ static int nf_tables_newrule(struct net
|
|
|
|
|
|
|
|
|
|
create = nlh->nlmsg_flags & NLM_F_CREATE ? true : false;
|
|
|
|
|
|
|
|
|
@ -661,7 +661,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
genmask);
|
|
|
|
|
if (IS_ERR(table))
|
|
|
|
|
return PTR_ERR(table);
|
|
|
|
|
@@ -2339,7 +2228,7 @@ static int nf_tables_newrule(struct net
|
|
|
|
|
@@ -2355,7 +2244,7 @@ static int nf_tables_newrule(struct net
|
|
|
|
|
return PTR_ERR(old_rule);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -670,7 +670,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
|
|
n = 0;
|
|
|
|
|
size = 0;
|
|
|
|
|
@@ -2468,18 +2357,13 @@ static int nf_tables_delrule(struct net
|
|
|
|
|
@@ -2484,18 +2373,13 @@ static int nf_tables_delrule(struct net
|
|
|
|
|
{
|
|
|
|
|
const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
|
|
|
|
|
u8 genmask = nft_genmask_next(net);
|
|
|
|
@ -690,7 +690,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
genmask);
|
|
|
|
|
if (IS_ERR(table))
|
|
|
|
|
return PTR_ERR(table);
|
|
|
|
|
@@ -2491,7 +2375,7 @@ static int nf_tables_delrule(struct net
|
|
|
|
|
@@ -2507,7 +2391,7 @@ static int nf_tables_delrule(struct net
|
|
|
|
|
return PTR_ERR(chain);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -699,7 +699,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
|
|
if (chain) {
|
|
|
|
|
if (nla[NFTA_RULE_HANDLE]) {
|
|
|
|
|
@@ -2676,26 +2560,17 @@ static int nft_ctx_init_from_setattr(str
|
|
|
|
|
@@ -2692,26 +2576,17 @@ static int nft_ctx_init_from_setattr(str
|
|
|
|
|
u8 genmask)
|
|
|
|
|
{
|
|
|
|
|
const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
|
|
|
|
@ -729,7 +729,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -2927,7 +2802,7 @@ static int nf_tables_dump_sets(struct sk
|
|
|
|
|
@@ -2943,7 +2818,7 @@ static int nf_tables_dump_sets(struct sk
|
|
|
|
|
|
|
|
|
|
list_for_each_entry_rcu(table, &net->nft.tables, list) {
|
|
|
|
|
if (ctx->family != NFPROTO_UNSPEC &&
|
|
|
|
@ -738,7 +738,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
if (ctx->table && ctx->table != table)
|
|
|
|
|
@@ -2948,7 +2823,7 @@ static int nf_tables_dump_sets(struct sk
|
|
|
|
|
@@ -2964,7 +2839,7 @@ static int nf_tables_dump_sets(struct sk
|
|
|
|
|
|
|
|
|
|
ctx_set = *ctx;
|
|
|
|
|
ctx_set.table = table;
|
|
|
|
@ -747,7 +747,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
|
|
if (nf_tables_fill_set(skb, &ctx_set, set,
|
|
|
|
|
NFT_MSG_NEWSET,
|
|
|
|
|
@@ -3060,8 +2935,8 @@ static int nf_tables_newset(struct net *
|
|
|
|
|
@@ -3076,8 +2951,8 @@ static int nf_tables_newset(struct net *
|
|
|
|
|
{
|
|
|
|
|
const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
|
|
|
|
|
u8 genmask = nft_genmask_next(net);
|
|
|
|
@ -757,7 +757,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
struct nft_table *table;
|
|
|
|
|
struct nft_set *set;
|
|
|
|
|
struct nft_ctx ctx;
|
|
|
|
|
@@ -3168,16 +3043,12 @@ static int nf_tables_newset(struct net *
|
|
|
|
|
@@ -3184,16 +3059,12 @@ static int nf_tables_newset(struct net *
|
|
|
|
|
|
|
|
|
|
create = nlh->nlmsg_flags & NLM_F_CREATE ? true : false;
|
|
|
|
|
|
|
|
|
@ -776,7 +776,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
|
|
set = nf_tables_set_lookup(table, nla[NFTA_SET_NAME], genmask);
|
|
|
|
|
if (IS_ERR(set)) {
|
|
|
|
|
@@ -3439,19 +3310,15 @@ static int nft_ctx_init_from_elemattr(st
|
|
|
|
|
@@ -3455,19 +3326,15 @@ static int nft_ctx_init_from_elemattr(st
|
|
|
|
|
u8 genmask)
|
|
|
|
|
{
|
|
|
|
|
const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
|
|
|
|
@ -799,7 +799,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -3569,7 +3436,7 @@ static int nf_tables_dump_set(struct sk_
|
|
|
|
|
@@ -3585,7 +3452,7 @@ static int nf_tables_dump_set(struct sk_
|
|
|
|
|
rcu_read_lock();
|
|
|
|
|
list_for_each_entry_rcu(table, &net->nft.tables, list) {
|
|
|
|
|
if (dump_ctx->ctx.family != NFPROTO_UNSPEC &&
|
|
|
|
@ -808,7 +808,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
if (table != dump_ctx->ctx.table)
|
|
|
|
|
@@ -3599,7 +3466,7 @@ static int nf_tables_dump_set(struct sk_
|
|
|
|
|
@@ -3615,7 +3482,7 @@ static int nf_tables_dump_set(struct sk_
|
|
|
|
|
goto nla_put_failure;
|
|
|
|
|
|
|
|
|
|
nfmsg = nlmsg_data(nlh);
|
|
|
|
@ -817,7 +817,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
nfmsg->version = NFNETLINK_V0;
|
|
|
|
|
nfmsg->res_id = htons(net->nft.base_seq & 0xffff);
|
|
|
|
|
|
|
|
|
|
@@ -4478,7 +4345,6 @@ static int nf_tables_newobj(struct net *
|
|
|
|
|
@@ -4494,7 +4361,6 @@ static int nf_tables_newobj(struct net *
|
|
|
|
|
const struct nft_object_type *type;
|
|
|
|
|
u8 genmask = nft_genmask_next(net);
|
|
|
|
|
int family = nfmsg->nfgen_family;
|
|
|
|
@ -825,7 +825,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
struct nft_table *table;
|
|
|
|
|
struct nft_object *obj;
|
|
|
|
|
struct nft_ctx ctx;
|
|
|
|
|
@@ -4490,11 +4356,7 @@ static int nf_tables_newobj(struct net *
|
|
|
|
|
@@ -4506,11 +4372,7 @@ static int nf_tables_newobj(struct net *
|
|
|
|
|
!nla[NFTA_OBJ_DATA])
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
|
@ -838,7 +838,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
genmask);
|
|
|
|
|
if (IS_ERR(table))
|
|
|
|
|
return PTR_ERR(table);
|
|
|
|
|
@@ -4513,7 +4375,7 @@ static int nf_tables_newobj(struct net *
|
|
|
|
|
@@ -4529,7 +4391,7 @@ static int nf_tables_newobj(struct net *
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -847,7 +847,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
|
|
type = nft_obj_type_get(objtype);
|
|
|
|
|
if (IS_ERR(type))
|
|
|
|
|
@@ -4605,7 +4467,7 @@ static int nf_tables_dump_obj(struct sk_
|
|
|
|
|
@@ -4621,7 +4483,7 @@ static int nf_tables_dump_obj(struct sk_
|
|
|
|
|
cb->seq = net->nft.base_seq;
|
|
|
|
|
|
|
|
|
|
list_for_each_entry_rcu(table, &net->nft.tables, list) {
|
|
|
|
@ -856,7 +856,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
list_for_each_entry_rcu(obj, &table->objects, list) {
|
|
|
|
|
@@ -4628,7 +4490,7 @@ static int nf_tables_dump_obj(struct sk_
|
|
|
|
|
@@ -4644,7 +4506,7 @@ static int nf_tables_dump_obj(struct sk_
|
|
|
|
|
cb->nlh->nlmsg_seq,
|
|
|
|
|
NFT_MSG_NEWOBJ,
|
|
|
|
|
NLM_F_MULTI | NLM_F_APPEND,
|
|
|
|
@ -865,7 +865,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
obj, reset) < 0)
|
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
|
|
@@ -4686,7 +4548,6 @@ static int nf_tables_getobj(struct net *
|
|
|
|
|
@@ -4702,7 +4564,6 @@ static int nf_tables_getobj(struct net *
|
|
|
|
|
const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
|
|
|
|
|
u8 genmask = nft_genmask_cur(net);
|
|
|
|
|
int family = nfmsg->nfgen_family;
|
|
|
|
@ -873,7 +873,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
const struct nft_table *table;
|
|
|
|
|
struct nft_object *obj;
|
|
|
|
|
struct sk_buff *skb2;
|
|
|
|
|
@@ -4717,11 +4578,7 @@ static int nf_tables_getobj(struct net *
|
|
|
|
|
@@ -4733,11 +4594,7 @@ static int nf_tables_getobj(struct net *
|
|
|
|
|
!nla[NFTA_OBJ_TYPE])
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
|
@ -886,7 +886,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
genmask);
|
|
|
|
|
if (IS_ERR(table))
|
|
|
|
|
return PTR_ERR(table);
|
|
|
|
|
@@ -4768,7 +4625,6 @@ static int nf_tables_delobj(struct net *
|
|
|
|
|
@@ -4784,7 +4641,6 @@ static int nf_tables_delobj(struct net *
|
|
|
|
|
const struct nfgenmsg *nfmsg = nlmsg_data(nlh);
|
|
|
|
|
u8 genmask = nft_genmask_next(net);
|
|
|
|
|
int family = nfmsg->nfgen_family;
|
|
|
|
@ -894,7 +894,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
struct nft_table *table;
|
|
|
|
|
struct nft_object *obj;
|
|
|
|
|
struct nft_ctx ctx;
|
|
|
|
|
@@ -4778,11 +4634,7 @@ static int nf_tables_delobj(struct net *
|
|
|
|
|
@@ -4794,11 +4650,7 @@ static int nf_tables_delobj(struct net *
|
|
|
|
|
!nla[NFTA_OBJ_NAME])
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
|
@ -907,7 +907,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
genmask);
|
|
|
|
|
if (IS_ERR(table))
|
|
|
|
|
return PTR_ERR(table);
|
|
|
|
|
@@ -4794,7 +4646,7 @@ static int nf_tables_delobj(struct net *
|
|
|
|
|
@@ -4810,7 +4662,7 @@ static int nf_tables_delobj(struct net *
|
|
|
|
|
if (obj->use > 0)
|
|
|
|
|
return -EBUSY;
|
|
|
|
|
|
|
|
|
@ -916,7 +916,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
|
|
return nft_delobj(&ctx, obj);
|
|
|
|
|
}
|
|
|
|
|
@@ -4979,33 +4831,31 @@ err1:
|
|
|
|
|
@@ -4995,33 +4847,31 @@ err1:
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -956,7 +956,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
return ERR_PTR(-EAGAIN);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
@@ -5053,7 +4903,6 @@ static int nf_tables_newflowtable(struct
|
|
|
|
|
@@ -5069,7 +4919,6 @@ static int nf_tables_newflowtable(struct
|
|
|
|
|
u8 genmask = nft_genmask_next(net);
|
|
|
|
|
int family = nfmsg->nfgen_family;
|
|
|
|
|
struct nft_flowtable *flowtable;
|
|
|
|
@ -964,7 +964,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
struct nft_table *table;
|
|
|
|
|
struct nft_ctx ctx;
|
|
|
|
|
int err, i, k;
|
|
|
|
|
@@ -5063,12 +4912,8 @@ static int nf_tables_newflowtable(struct
|
|
|
|
|
@@ -5079,12 +4928,8 @@ static int nf_tables_newflowtable(struct
|
|
|
|
|
!nla[NFTA_FLOWTABLE_HOOK])
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
|
@ -978,7 +978,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
if (IS_ERR(table))
|
|
|
|
|
return PTR_ERR(table);
|
|
|
|
|
|
|
|
|
|
@@ -5085,7 +4930,7 @@ static int nf_tables_newflowtable(struct
|
|
|
|
|
@@ -5101,7 +4946,7 @@ static int nf_tables_newflowtable(struct
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -987,7 +987,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
|
|
flowtable = kzalloc(sizeof(*flowtable), GFP_KERNEL);
|
|
|
|
|
if (!flowtable)
|
|
|
|
|
@@ -5098,7 +4943,7 @@ static int nf_tables_newflowtable(struct
|
|
|
|
|
@@ -5114,7 +4959,7 @@ static int nf_tables_newflowtable(struct
|
|
|
|
|
goto err1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -996,7 +996,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
if (IS_ERR(type)) {
|
|
|
|
|
err = PTR_ERR(type);
|
|
|
|
|
goto err2;
|
|
|
|
|
@@ -5158,16 +5003,11 @@ static int nf_tables_delflowtable(struct
|
|
|
|
|
@@ -5174,16 +5019,11 @@ static int nf_tables_delflowtable(struct
|
|
|
|
|
u8 genmask = nft_genmask_next(net);
|
|
|
|
|
int family = nfmsg->nfgen_family;
|
|
|
|
|
struct nft_flowtable *flowtable;
|
|
|
|
@ -1014,7 +1014,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
if (IS_ERR(table))
|
|
|
|
|
return PTR_ERR(table);
|
|
|
|
|
|
|
|
|
|
@@ -5178,7 +5018,7 @@ static int nf_tables_delflowtable(struct
|
|
|
|
|
@@ -5194,7 +5034,7 @@ static int nf_tables_delflowtable(struct
|
|
|
|
|
if (flowtable->use > 0)
|
|
|
|
|
return -EBUSY;
|
|
|
|
|
|
|
|
|
@ -1023,7 +1023,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
|
|
return nft_delflowtable(&ctx, flowtable);
|
|
|
|
|
}
|
|
|
|
|
@@ -5253,7 +5093,7 @@ static int nf_tables_dump_flowtable(stru
|
|
|
|
|
@@ -5269,7 +5109,7 @@ static int nf_tables_dump_flowtable(stru
|
|
|
|
|
cb->seq = net->nft.base_seq;
|
|
|
|
|
|
|
|
|
|
list_for_each_entry_rcu(table, &net->nft.tables, list) {
|
|
|
|
@ -1032,7 +1032,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
list_for_each_entry_rcu(flowtable, &table->flowtables, list) {
|
|
|
|
|
@@ -5272,7 +5112,7 @@ static int nf_tables_dump_flowtable(stru
|
|
|
|
|
@@ -5288,7 +5128,7 @@ static int nf_tables_dump_flowtable(stru
|
|
|
|
|
cb->nlh->nlmsg_seq,
|
|
|
|
|
NFT_MSG_NEWFLOWTABLE,
|
|
|
|
|
NLM_F_MULTI | NLM_F_APPEND,
|
|
|
|
@ -1041,7 +1041,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
|
|
nl_dump_check_consistent(cb, nlmsg_hdr(skb));
|
|
|
|
|
@@ -5332,7 +5172,6 @@ static int nf_tables_getflowtable(struct
|
|
|
|
|
@@ -5348,7 +5188,6 @@ static int nf_tables_getflowtable(struct
|
|
|
|
|
u8 genmask = nft_genmask_cur(net);
|
|
|
|
|
int family = nfmsg->nfgen_family;
|
|
|
|
|
struct nft_flowtable *flowtable;
|
|
|
|
@ -1049,7 +1049,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
const struct nft_table *table;
|
|
|
|
|
struct sk_buff *skb2;
|
|
|
|
|
int err;
|
|
|
|
|
@@ -5358,12 +5197,8 @@ static int nf_tables_getflowtable(struct
|
|
|
|
|
@@ -5374,12 +5213,8 @@ static int nf_tables_getflowtable(struct
|
|
|
|
|
if (!nla[NFTA_FLOWTABLE_NAME])
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
|
@ -1063,7 +1063,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
if (IS_ERR(table))
|
|
|
|
|
return PTR_ERR(table);
|
|
|
|
|
|
|
|
|
|
@@ -6529,7 +6364,7 @@ int __nft_release_basechain(struct nft_c
|
|
|
|
|
@@ -6550,7 +6385,7 @@ int __nft_release_basechain(struct nft_c
|
|
|
|
|
}
|
|
|
|
|
EXPORT_SYMBOL_GPL(__nft_release_basechain);
|
|
|
|
|
|
|
|
|
@ -1072,7 +1072,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
{
|
|
|
|
|
struct nft_flowtable *flowtable, *nf;
|
|
|
|
|
struct nft_table *table, *nt;
|
|
|
|
|
@@ -6542,7 +6377,7 @@ static void __nft_release_afinfo(struct
|
|
|
|
|
@@ -6563,7 +6398,7 @@ static void __nft_release_afinfo(struct
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
list_for_each_entry_safe(table, nt, &net->nft.tables, list) {
|
|
|
|
@ -1081,7 +1081,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
|
|
|
|
|
list_for_each_entry(chain, &table->chains, list)
|
|
|
|
|
nf_tables_unregister_hook(net, table, chain);
|
|
|
|
|
@@ -6594,7 +6429,7 @@ static int __net_init nf_tables_init_net
|
|
|
|
|
@@ -6615,7 +6450,7 @@ static int __net_init nf_tables_init_net
|
|
|
|
|
|
|
|
|
|
static void __net_exit nf_tables_exit_net(struct net *net)
|
|
|
|
|
{
|
|
|
|
|