|
|
|
@ -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);
|
|
|
|
|
|
|
|
|
|
@@ -4516,7 +4383,6 @@ static int nf_tables_newobj(struct net *
|
|
|
|
|
@@ -4522,7 +4389,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;
|
|
|
|
|
@@ -4528,11 +4394,7 @@ static int nf_tables_newobj(struct net *
|
|
|
|
|
@@ -4534,11 +4400,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);
|
|
|
|
|
@@ -4551,7 +4413,7 @@ static int nf_tables_newobj(struct net *
|
|
|
|
|
@@ -4557,7 +4419,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))
|
|
|
|
|
@@ -4643,7 +4505,7 @@ static int nf_tables_dump_obj(struct sk_
|
|
|
|
|
@@ -4649,7 +4511,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) {
|
|
|
|
|
@@ -4666,7 +4528,7 @@ static int nf_tables_dump_obj(struct sk_
|
|
|
|
|
@@ -4672,7 +4534,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;
|
|
|
|
|
|
|
|
|
|
@@ -4724,7 +4586,6 @@ static int nf_tables_getobj(struct net *
|
|
|
|
|
@@ -4730,7 +4592,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;
|
|
|
|
|
@@ -4755,11 +4616,7 @@ static int nf_tables_getobj(struct net *
|
|
|
|
|
@@ -4761,11 +4622,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);
|
|
|
|
|
@@ -4806,7 +4663,6 @@ static int nf_tables_delobj(struct net *
|
|
|
|
|
@@ -4812,7 +4669,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;
|
|
|
|
|
@@ -4816,11 +4672,7 @@ static int nf_tables_delobj(struct net *
|
|
|
|
|
@@ -4822,11 +4678,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);
|
|
|
|
|
@@ -4832,7 +4684,7 @@ static int nf_tables_delobj(struct net *
|
|
|
|
|
@@ -4838,7 +4690,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);
|
|
|
|
|
}
|
|
|
|
|
@@ -5017,33 +4869,31 @@ err1:
|
|
|
|
|
@@ -5023,33 +4875,31 @@ err1:
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -956,7 +956,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
|
return ERR_PTR(-EAGAIN);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
@@ -5091,7 +4941,6 @@ static int nf_tables_newflowtable(struct
|
|
|
|
|
@@ -5097,7 +4947,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;
|
|
|
|
|
@@ -5101,12 +4950,8 @@ static int nf_tables_newflowtable(struct
|
|
|
|
|
@@ -5107,12 +4956,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);
|
|
|
|
|
|
|
|
|
|
@@ -5123,7 +4968,7 @@ static int nf_tables_newflowtable(struct
|
|
|
|
|
@@ -5129,7 +4974,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)
|
|
|
|
|
@@ -5136,7 +4981,7 @@ static int nf_tables_newflowtable(struct
|
|
|
|
|
@@ -5142,7 +4987,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;
|
|
|
|
|
@@ -5196,16 +5041,11 @@ static int nf_tables_delflowtable(struct
|
|
|
|
|
@@ -5202,16 +5047,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);
|
|
|
|
|
|
|
|
|
|
@@ -5216,7 +5056,7 @@ static int nf_tables_delflowtable(struct
|
|
|
|
|
@@ -5222,7 +5062,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);
|
|
|
|
|
}
|
|
|
|
|
@@ -5291,7 +5131,7 @@ static int nf_tables_dump_flowtable(stru
|
|
|
|
|
@@ -5297,7 +5137,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) {
|
|
|
|
|
@@ -5310,7 +5150,7 @@ static int nf_tables_dump_flowtable(stru
|
|
|
|
|
@@ -5316,7 +5156,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));
|
|
|
|
|
@@ -5370,7 +5210,6 @@ static int nf_tables_getflowtable(struct
|
|
|
|
|
@@ -5376,7 +5216,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;
|
|
|
|
|
@@ -5396,12 +5235,8 @@ static int nf_tables_getflowtable(struct
|
|
|
|
|
@@ -5402,12 +5241,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);
|
|
|
|
|
|
|
|
|
|
@@ -6572,7 +6407,7 @@ int __nft_release_basechain(struct nft_c
|
|
|
|
|
@@ -6578,7 +6413,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;
|
|
|
|
|
@@ -6585,7 +6420,7 @@ static void __nft_release_afinfo(struct
|
|
|
|
|
@@ -6591,7 +6426,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);
|
|
|
|
|
@@ -6637,7 +6472,7 @@ static int __net_init nf_tables_init_net
|
|
|
|
|
@@ -6643,7 +6478,7 @@ static int __net_init nf_tables_init_net
|
|
|
|
|
|
|
|
|
|
static void __net_exit nf_tables_exit_net(struct net *net)
|
|
|
|
|
{
|
|
|
|
|