|
@@ -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;
|
|
|
-@@ -3200,16 +3075,12 @@ static int nf_tables_newset(struct net *
|
|
|
+@@ -3203,16 +3078,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)) {
|
|
|
-@@ -3471,19 +3342,15 @@ static int nft_ctx_init_from_elemattr(st
|
|
|
+@@ -3474,19 +3345,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;
|
|
|
}
|
|
|
|
|
|
-@@ -3601,7 +3468,7 @@ static int nf_tables_dump_set(struct sk_
|
|
|
+@@ -3604,7 +3471,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)
|
|
|
-@@ -3631,7 +3498,7 @@ static int nf_tables_dump_set(struct sk_
|
|
|
+@@ -3634,7 +3501,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);
|
|
|
|
|
|
-@@ -4513,7 +4380,6 @@ static int nf_tables_newobj(struct net *
|
|
|
+@@ -4516,7 +4383,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;
|
|
|
-@@ -4525,11 +4391,7 @@ static int nf_tables_newobj(struct net *
|
|
|
+@@ -4528,11 +4394,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);
|
|
|
-@@ -4548,7 +4410,7 @@ static int nf_tables_newobj(struct net *
|
|
|
+@@ -4551,7 +4413,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))
|
|
|
-@@ -4640,7 +4502,7 @@ static int nf_tables_dump_obj(struct sk_
|
|
|
+@@ -4643,7 +4505,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) {
|
|
|
-@@ -4663,7 +4525,7 @@ static int nf_tables_dump_obj(struct sk_
|
|
|
+@@ -4666,7 +4528,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;
|
|
|
|
|
|
-@@ -4721,7 +4583,6 @@ static int nf_tables_getobj(struct net *
|
|
|
+@@ -4724,7 +4586,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;
|
|
|
-@@ -4752,11 +4613,7 @@ static int nf_tables_getobj(struct net *
|
|
|
+@@ -4755,11 +4616,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);
|
|
|
-@@ -4803,7 +4660,6 @@ static int nf_tables_delobj(struct net *
|
|
|
+@@ -4806,7 +4663,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;
|
|
|
-@@ -4813,11 +4669,7 @@ static int nf_tables_delobj(struct net *
|
|
|
+@@ -4816,11 +4672,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);
|
|
|
-@@ -4829,7 +4681,7 @@ static int nf_tables_delobj(struct net *
|
|
|
+@@ -4832,7 +4684,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);
|
|
|
}
|
|
|
-@@ -5014,33 +4866,31 @@ err1:
|
|
|
+@@ -5017,33 +4869,31 @@ err1:
|
|
|
return err;
|
|
|
}
|
|
|
|
|
@@ -956,7 +956,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
return ERR_PTR(-EAGAIN);
|
|
|
}
|
|
|
#endif
|
|
|
-@@ -5088,7 +4938,6 @@ static int nf_tables_newflowtable(struct
|
|
|
+@@ -5091,7 +4941,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;
|
|
|
-@@ -5098,12 +4947,8 @@ static int nf_tables_newflowtable(struct
|
|
|
+@@ -5101,12 +4950,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);
|
|
|
|
|
|
-@@ -5120,7 +4965,7 @@ static int nf_tables_newflowtable(struct
|
|
|
+@@ -5123,7 +4968,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)
|
|
|
-@@ -5133,7 +4978,7 @@ static int nf_tables_newflowtable(struct
|
|
|
+@@ -5136,7 +4981,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;
|
|
|
-@@ -5193,16 +5038,11 @@ static int nf_tables_delflowtable(struct
|
|
|
+@@ -5196,16 +5041,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);
|
|
|
|
|
|
-@@ -5213,7 +5053,7 @@ static int nf_tables_delflowtable(struct
|
|
|
+@@ -5216,7 +5056,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);
|
|
|
}
|
|
|
-@@ -5288,7 +5128,7 @@ static int nf_tables_dump_flowtable(stru
|
|
|
+@@ -5291,7 +5131,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) {
|
|
|
-@@ -5307,7 +5147,7 @@ static int nf_tables_dump_flowtable(stru
|
|
|
+@@ -5310,7 +5150,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));
|
|
|
-@@ -5367,7 +5207,6 @@ static int nf_tables_getflowtable(struct
|
|
|
+@@ -5370,7 +5210,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;
|
|
|
-@@ -5393,12 +5232,8 @@ static int nf_tables_getflowtable(struct
|
|
|
+@@ -5396,12 +5235,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);
|
|
|
|
|
|
-@@ -6569,7 +6404,7 @@ int __nft_release_basechain(struct nft_c
|
|
|
+@@ -6572,7 +6407,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;
|
|
|
-@@ -6582,7 +6417,7 @@ static void __nft_release_afinfo(struct
|
|
|
+@@ -6585,7 +6420,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);
|
|
|
-@@ -6634,7 +6469,7 @@ static int __net_init nf_tables_init_net
|
|
|
+@@ -6637,7 +6472,7 @@ static int __net_init nf_tables_init_net
|
|
|
|
|
|
static void __net_exit nf_tables_exit_net(struct net *net)
|
|
|
{
|