projects
/
oweals
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 4.14 to 4.14.99
[oweals/openwrt.git]
/
target
/
linux
/
generic
/
backport-4.14
/
335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch
diff --git
a/target/linux/generic/backport-4.14/335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch
b/target/linux/generic/backport-4.14/335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch
index 47ba98c1910ad2a69f7c9483ab821e9d489c6901..e08b9b26d5b30214ab12c5dcabe1ebb072a1a47c 100644
(file)
--- a/
target/linux/generic/backport-4.14/335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch
+++ b/
target/linux/generic/backport-4.14/335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch
@@
-467,7
+467,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
if (err < 0)
return err;
if (err < 0)
return err;
-@@ -150
9,7 +1504
,7 @@ static int nf_tables_updchain(struct nft
+@@ -150
8,7 +1503
,7 @@ static int nf_tables_updchain(struct nft
if (!nft_is_base_chain(chain))
return -EBUSY;
if (!nft_is_base_chain(chain))
return -EBUSY;
@@
-476,7
+476,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
create);
if (err < 0)
return err;
create);
if (err < 0)
return err;
-@@ -16
02,7 +1597
,8 @@ static int nf_tables_newchain(struct net
+@@ -16
18,7 +1613
,8 @@ static int nf_tables_newchain(struct net
if (IS_ERR(afi))
return PTR_ERR(afi);
if (IS_ERR(afi))
return PTR_ERR(afi);
@@
-486,7
+486,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
if (IS_ERR(table))
return PTR_ERR(table);
if (IS_ERR(table))
return PTR_ERR(table);
-@@ -16
42,7 +1638
,7 @@ static int nf_tables_newchain(struct net
+@@ -16
58,7 +1654
,7 @@ static int nf_tables_newchain(struct net
}
}
}
}
@@
-495,7
+495,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
if (chain != NULL) {
if (nlh->nlmsg_flags & NLM_F_EXCL)
if (chain != NULL) {
if (nlh->nlmsg_flags & NLM_F_EXCL)
-@@ -16
76,7 +1672
,8 @@ static int nf_tables_delchain(struct net
+@@ -16
92,7 +1688
,8 @@ static int nf_tables_delchain(struct net
if (IS_ERR(afi))
return PTR_ERR(afi);
if (IS_ERR(afi))
return PTR_ERR(afi);
@@
-505,7
+505,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
if (IS_ERR(table))
return PTR_ERR(table);
if (IS_ERR(table))
return PTR_ERR(table);
-@@ -1
688,7 +1685
,7 @@ static int nf_tables_delchain(struct net
+@@ -1
704,7 +1701
,7 @@ static int nf_tables_delchain(struct net
chain->use > 0)
return -EBUSY;
chain->use > 0)
return -EBUSY;
@@
-514,7
+514,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
use = chain->use;
list_for_each_entry(rule, &chain->rules, list) {
use = chain->use;
list_for_each_entry(rule, &chain->rules, list) {
-@@ -18
53,7 +1850
,7 @@ static int nf_tables_expr_parse(const st
+@@ -18
69,7 +1866
,7 @@ static int nf_tables_expr_parse(const st
if (err < 0)
return err;
if (err < 0)
return err;
@@
-523,7
+523,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
if (IS_ERR(type))
return PTR_ERR(type);
if (IS_ERR(type))
return PTR_ERR(type);
-@@ -20
77,7 +2074
,7 @@ static void nf_tables_rule_notify(const
+@@ -20
93,7 +2090
,7 @@ static void nf_tables_rule_notify(const
goto err;
err = nf_tables_fill_rule_info(skb, ctx->net, ctx->portid, ctx->seq,
goto err;
err = nf_tables_fill_rule_info(skb, ctx->net, ctx->portid, ctx->seq,
@@
-532,7
+532,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
ctx->chain, rule);
if (err < 0) {
kfree_skb(skb);
ctx->chain, rule);
if (err < 0) {
kfree_skb(skb);
-@@ -21
01,7 +2098
,6 @@ static int nf_tables_dump_rules(struct s
+@@ -21
17,7 +2114
,6 @@ static int nf_tables_dump_rules(struct s
{
const struct nfgenmsg *nfmsg = nlmsg_data(cb->nlh);
const struct nft_rule_dump_ctx *ctx = cb->data;
{
const struct nfgenmsg *nfmsg = nlmsg_data(cb->nlh);
const struct nft_rule_dump_ctx *ctx = cb->data;
@@
-540,7
+540,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;
const struct nft_table *table;
const struct nft_chain *chain;
const struct nft_rule *rule;
-@@ -21
12,39 +2108
,37 @@ static int nf_tables_dump_rules(struct s
+@@ -21
28,39 +2124
,37 @@ static int nf_tables_dump_rules(struct s
rcu_read_lock();
cb->seq = net->nft.base_seq;
rcu_read_lock();
cb->seq = net->nft.base_seq;
@@
-605,7
+605,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
}
}
}
}
}
}
-@@ -22
22,7 +2216
,8 @@ static int nf_tables_getrule(struct net
+@@ -22
38,7 +2232
,8 @@ static int nf_tables_getrule(struct net
if (IS_ERR(afi))
return PTR_ERR(afi);
if (IS_ERR(afi))
return PTR_ERR(afi);
@@
-615,7
+615,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
if (IS_ERR(table))
return PTR_ERR(table);
if (IS_ERR(table))
return PTR_ERR(table);
-@@ -23
06,7 +2301
,8 @@ static int nf_tables_newrule(struct net
+@@ -23
23,7 +2318
,8 @@ static int nf_tables_newrule(struct net
if (IS_ERR(afi))
return PTR_ERR(afi);
if (IS_ERR(afi))
return PTR_ERR(afi);
@@
-625,7
+625,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
if (IS_ERR(table))
return PTR_ERR(table);
if (IS_ERR(table))
return PTR_ERR(table);
-@@ -23
45,7 +2341
,7 @@ static int nf_tables_newrule(struct net
+@@ -23
62,7 +2358
,7 @@ static int nf_tables_newrule(struct net
return PTR_ERR(old_rule);
}
return PTR_ERR(old_rule);
}
@@
-634,7
+634,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
n = 0;
size = 0;
n = 0;
size = 0;
-@@ -24
85,7 +248
1,8 @@ static int nf_tables_delrule(struct net
+@@ -24
95,7 +249
1,8 @@ static int nf_tables_delrule(struct net
if (IS_ERR(afi))
return PTR_ERR(afi);
if (IS_ERR(afi))
return PTR_ERR(afi);
@@
-644,7
+644,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
if (IS_ERR(table))
return PTR_ERR(table);
if (IS_ERR(table))
return PTR_ERR(table);
-@@ -2
496,7 +249
3,7 @@ static int nf_tables_delrule(struct net
+@@ -2
506,7 +250
3,7 @@ static int nf_tables_delrule(struct net
return PTR_ERR(chain);
}
return PTR_ERR(chain);
}
@@
-653,7
+653,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
if (chain) {
if (nla[NFTA_RULE_HANDLE]) {
if (chain) {
if (nla[NFTA_RULE_HANDLE]) {
-@@ -2
694,13 +269
1,13 @@ static int nft_ctx_init_from_setattr(str
+@@ -2
704,13 +270
1,13 @@ static int nft_ctx_init_from_setattr(str
if (afi == NULL)
return -EAFNOSUPPORT;
if (afi == NULL)
return -EAFNOSUPPORT;
@@
-670,7
+670,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
return 0;
}
return 0;
}
-@@ -28
28,7 +282
5,7 @@ static int nf_tables_fill_set(struct sk_
+@@ -28
38,7 +283
5,7 @@ static int nf_tables_fill_set(struct sk_
goto nla_put_failure;
nfmsg = nlmsg_data(nlh);
goto nla_put_failure;
nfmsg = nlmsg_data(nlh);
@@
-679,7
+679,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
nfmsg->version = NFNETLINK_V0;
nfmsg->res_id = htons(ctx->net->nft.base_seq & 0xffff);
nfmsg->version = NFNETLINK_V0;
nfmsg->res_id = htons(ctx->net->nft.base_seq & 0xffff);
-@@ -29
20,10 +291
7,8 @@ static int nf_tables_dump_sets(struct sk
+@@ -29
30,10 +292
7,8 @@ static int nf_tables_dump_sets(struct sk
{
const struct nft_set *set;
unsigned int idx, s_idx = cb->args[0];
{
const struct nft_set *set;
unsigned int idx, s_idx = cb->args[0];
@@
-690,7
+690,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
struct nft_ctx *ctx = cb->data, ctx_set;
if (cb->args[1])
struct nft_ctx *ctx = cb->data, ctx_set;
if (cb->args[1])
-@@ -29
32,51 +292
7,44 @@ static int nf_tables_dump_sets(struct sk
+@@ -29
42,51 +293
7,44 @@ static int nf_tables_dump_sets(struct sk
rcu_read_lock();
cb->seq = net->nft.base_seq;
rcu_read_lock();
cb->seq = net->nft.base_seq;
@@
-771,7
+771,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
}
cb->args[1] = 1;
done:
}
cb->args[1] = 1;
done:
-@@ -31
86,11 +317
4,12 @@ static int nf_tables_newset(struct net *
+@@ -31
96,11 +318
4,12 @@ static int nf_tables_newset(struct net *
if (IS_ERR(afi))
return PTR_ERR(afi);
if (IS_ERR(afi))
return PTR_ERR(afi);
@@
-786,7
+786,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)) {
set = nf_tables_set_lookup(table, nla[NFTA_SET_NAME], genmask);
if (IS_ERR(set)) {
-@@ -34
59,12 +344
8,12 @@ static int nft_ctx_init_from_elemattr(st
+@@ -34
69,12 +345
8,12 @@ static int nft_ctx_init_from_elemattr(st
if (IS_ERR(afi))
return PTR_ERR(afi);
if (IS_ERR(afi))
return PTR_ERR(afi);
@@
-802,7
+802,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
return 0;
}
return 0;
}
-@@ -35
69,7 +355
8,6 @@ static int nf_tables_dump_set(struct sk_
+@@ -35
79,7 +356
8,6 @@ static int nf_tables_dump_set(struct sk_
{
struct nft_set_dump_ctx *dump_ctx = cb->data;
struct net *net = sock_net(skb->sk);
{
struct nft_set_dump_ctx *dump_ctx = cb->data;
struct net *net = sock_net(skb->sk);
@@
-810,7
+810,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
struct nft_table *table;
struct nft_set *set;
struct nft_set_dump_args args;
struct nft_table *table;
struct nft_set *set;
struct nft_set_dump_args args;
-@@ -35
81,21 +356
9,19 @@ static int nf_tables_dump_set(struct sk_
+@@ -35
91,21 +357
9,19 @@ static int nf_tables_dump_set(struct sk_
int event;
rcu_read_lock();
int event;
rcu_read_lock();
@@
-841,7
+841,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
}
break;
}
}
break;
}
-@@ -36
15,7 +360
1,7 @@ static int nf_tables_dump_set(struct sk_
+@@ -36
25,7 +361
1,7 @@ static int nf_tables_dump_set(struct sk_
goto nla_put_failure;
nfmsg = nlmsg_data(nlh);
goto nla_put_failure;
nfmsg = nlmsg_data(nlh);
@@
-850,7
+850,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
nfmsg->version = NFNETLINK_V0;
nfmsg->res_id = htons(net->nft.base_seq & 0xffff);
nfmsg->version = NFNETLINK_V0;
nfmsg->res_id = htons(net->nft.base_seq & 0xffff);
-@@ -37
17,7 +370
3,7 @@ static int nf_tables_fill_setelem_info(s
+@@ -37
27,7 +371
3,7 @@ static int nf_tables_fill_setelem_info(s
goto nla_put_failure;
nfmsg = nlmsg_data(nlh);
goto nla_put_failure;
nfmsg = nlmsg_data(nlh);
@@
-859,7
+859,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
nfmsg->version = NFNETLINK_V0;
nfmsg->res_id = htons(ctx->net->nft.base_seq & 0xffff);
nfmsg->version = NFNETLINK_V0;
nfmsg->res_id = htons(ctx->net->nft.base_seq & 0xffff);
-@@ -39
61,7 +394
7,7 @@ static int nft_add_set_elem(struct nft_c
+@@ -39
71,7 +395
7,7 @@ static int nft_add_set_elem(struct nft_c
list_for_each_entry(binding, &set->bindings, list) {
struct nft_ctx bind_ctx = {
.net = ctx->net,
list_for_each_entry(binding, &set->bindings, list) {
struct nft_ctx bind_ctx = {
.net = ctx->net,
@@
-868,7
+868,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
.table = ctx->table,
.chain = (struct nft_chain *)binding->chain,
};
.table = ctx->table,
.chain = (struct nft_chain *)binding->chain,
};
-@@ -45
10,7 +4496
,8 @@ static int nf_tables_newobj(struct net *
+@@ -45
21,7 +4507
,8 @@ static int nf_tables_newobj(struct net *
if (IS_ERR(afi))
return PTR_ERR(afi);
if (IS_ERR(afi))
return PTR_ERR(afi);
@@
-878,7
+878,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
if (IS_ERR(table))
return PTR_ERR(table);
if (IS_ERR(table))
return PTR_ERR(table);
-@@ -45
28,7 +4515
,7 @@ static int nf_tables_newobj(struct net *
+@@ -45
39,7 +4526
,7 @@ static int nf_tables_newobj(struct net *
return 0;
}
return 0;
}
@@
-887,7
+887,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
type = nft_obj_type_get(objtype);
if (IS_ERR(type))
type = nft_obj_type_get(objtype);
if (IS_ERR(type))
-@@ -46
05,7 +4592
,6 @@ struct nft_obj_filter {
+@@ -46
16,7 +4603
,6 @@ struct nft_obj_filter {
static int nf_tables_dump_obj(struct sk_buff *skb, struct netlink_callback *cb)
{
const struct nfgenmsg *nfmsg = nlmsg_data(cb->nlh);
static int nf_tables_dump_obj(struct sk_buff *skb, struct netlink_callback *cb)
{
const struct nfgenmsg *nfmsg = nlmsg_data(cb->nlh);
@@
-895,7
+895,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
const struct nft_table *table;
unsigned int idx = 0, s_idx = cb->args[0];
struct nft_obj_filter *filter = cb->data;
const struct nft_table *table;
unsigned int idx = 0, s_idx = cb->args[0];
struct nft_obj_filter *filter = cb->data;
-@@ -46
20,38 +4606
,37 @@ static int nf_tables_dump_obj(struct sk_
+@@ -46
31,38 +4617
,37 @@ static int nf_tables_dump_obj(struct sk_
rcu_read_lock();
cb->seq = net->nft.base_seq;
rcu_read_lock();
cb->seq = net->nft.base_seq;
@@
-960,7
+960,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
}
}
done:
}
}
done:
-@@ -47
38,7 +4723
,8 @@ static int nf_tables_getobj(struct net *
+@@ -47
49,7 +4734
,8 @@ static int nf_tables_getobj(struct net *
if (IS_ERR(afi))
return PTR_ERR(afi);
if (IS_ERR(afi))
return PTR_ERR(afi);
@@
-970,7
+970,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
if (IS_ERR(table))
return PTR_ERR(table);
if (IS_ERR(table))
return PTR_ERR(table);
-@@ -4
798,7 +4784
,8 @@ static int nf_tables_delobj(struct net *
+@@ -4
809,7 +4795
,8 @@ static int nf_tables_delobj(struct net *
if (IS_ERR(afi))
return PTR_ERR(afi);
if (IS_ERR(afi))
return PTR_ERR(afi);
@@
-980,7
+980,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
if (IS_ERR(table))
return PTR_ERR(table);
if (IS_ERR(table))
return PTR_ERR(table);
-@@ -48
09,7 +4796
,7 @@ static int nf_tables_delobj(struct net *
+@@ -48
20,7 +4807
,7 @@ static int nf_tables_delobj(struct net *
if (obj->use > 0)
return -EBUSY;
if (obj->use > 0)
return -EBUSY;
@@
-989,7
+989,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
return nft_delobj(&ctx, obj);
}
return nft_delobj(&ctx, obj);
}
-@@ -48
47,7 +4834
,7 @@ static void nf_tables_obj_notify(const s
+@@ -48
58,7 +4845
,7 @@ static void nf_tables_obj_notify(const s
struct nft_object *obj, int event)
{
nft_obj_notify(ctx->net, ctx->table, obj, ctx->portid, ctx->seq, event,
struct nft_object *obj, int event)
{
nft_obj_notify(ctx->net, ctx->table, obj, ctx->portid, ctx->seq, event,
@@
-998,7
+998,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
}
/*
}
/*
-@@ -50
37,7 +5024
,7 @@ void nft_flow_table_iterate(struct net *
+@@ -50
48,7 +5035
,7 @@ void nft_flow_table_iterate(struct net *
rcu_read_lock();
list_for_each_entry_rcu(afi, &net->nft.af_info, list) {
rcu_read_lock();
list_for_each_entry_rcu(afi, &net->nft.af_info, list) {
@@
-1007,7
+1007,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
list_for_each_entry_rcu(flowtable, &table->flowtables, list) {
iter(&flowtable->data, data);
}
list_for_each_entry_rcu(flowtable, &table->flowtables, list) {
iter(&flowtable->data, data);
}
-@@ -50
85,7 +5072
,8 @@ static int nf_tables_newflowtable(struct
+@@ -50
96,7 +5083
,8 @@ static int nf_tables_newflowtable(struct
if (IS_ERR(afi))
return PTR_ERR(afi);
if (IS_ERR(afi))
return PTR_ERR(afi);
@@
-1017,7
+1017,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
if (IS_ERR(table))
return PTR_ERR(table);
if (IS_ERR(table))
return PTR_ERR(table);
-@@ -51
02,7 +5090
,7 @@ static int nf_tables_newflowtable(struct
+@@ -51
13,7 +5101
,7 @@ static int nf_tables_newflowtable(struct
return 0;
}
return 0;
}
@@
-1026,7
+1026,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
flowtable = kzalloc(sizeof(*flowtable), GFP_KERNEL);
if (!flowtable)
flowtable = kzalloc(sizeof(*flowtable), GFP_KERNEL);
if (!flowtable)
-@@ -51
83,7 +5171
,8 @@ static int nf_tables_delflowtable(struct
+@@ -51
94,7 +5182
,8 @@ static int nf_tables_delflowtable(struct
if (IS_ERR(afi))
return PTR_ERR(afi);
if (IS_ERR(afi))
return PTR_ERR(afi);
@@
-1036,7
+1036,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
if (IS_ERR(table))
return PTR_ERR(table);
if (IS_ERR(table))
return PTR_ERR(table);
-@@ -5
194,7 +5183
,7 @@ static int nf_tables_delflowtable(struct
+@@ -5
205,7 +5194
,7 @@ static int nf_tables_delflowtable(struct
if (flowtable->use > 0)
return -EBUSY;
if (flowtable->use > 0)
return -EBUSY;
@@
-1045,7
+1045,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
return nft_delflowtable(&ctx, flowtable);
}
return nft_delflowtable(&ctx, flowtable);
}
-@@ -52
63,40 +5252
,37 @@ static int nf_tables_dump_flowtable(stru
+@@ -52
74,40 +5263
,37 @@ static int nf_tables_dump_flowtable(stru
struct net *net = sock_net(skb->sk);
int family = nfmsg->nfgen_family;
struct nft_flowtable *flowtable;
struct net *net = sock_net(skb->sk);
int family = nfmsg->nfgen_family;
struct nft_flowtable *flowtable;
@@
-1107,7
+1107,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
}
}
done:
}
}
done:
-@@ -53
81,7 +5367
,8 @@ static int nf_tables_getflowtable(struct
+@@ -53
92,7 +5378
,8 @@ static int nf_tables_getflowtable(struct
if (IS_ERR(afi))
return PTR_ERR(afi);
if (IS_ERR(afi))
return PTR_ERR(afi);
@@
-1117,7
+1117,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
if (IS_ERR(table))
return PTR_ERR(table);
if (IS_ERR(table))
return PTR_ERR(table);
-@@ -54
24,7 +5411
,7 @@ static void nf_tables_flowtable_notify(s
+@@ -54
35,7 +5422
,7 @@ static void nf_tables_flowtable_notify(s
err = nf_tables_fill_flowtable_info(skb, ctx->net, ctx->portid,
ctx->seq, event, 0,
err = nf_tables_fill_flowtable_info(skb, ctx->net, ctx->portid,
ctx->seq, event, 0,
@@
-1126,7
+1126,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
if (err < 0) {
kfree_skb(skb);
goto err;
if (err < 0) {
kfree_skb(skb);
goto err;
-@@ -55
02,17 +5489
,14 @@ static int nf_tables_flowtable_event(str
+@@ -55
13,17 +5500
,14 @@ static int nf_tables_flowtable_event(str
struct net_device *dev = netdev_notifier_info_to_dev(ptr);
struct nft_flowtable *flowtable;
struct nft_table *table;
struct net_device *dev = netdev_notifier_info_to_dev(ptr);
struct nft_flowtable *flowtable;
struct nft_table *table;
@@
-1147,7
+1147,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
}
}
nfnl_unlock(NFNL_SUBSYS_NFTABLES);
}
}
nfnl_unlock(NFNL_SUBSYS_NFTABLES);
-@@ -65
33,6 +6517
,7 @@ EXPORT_SYMBOL_GPL(nft_data_dump);
+@@ -65
49,6 +6533
,7 @@ EXPORT_SYMBOL_GPL(nft_data_dump);
static int __net_init nf_tables_init_net(struct net *net)
{
INIT_LIST_HEAD(&net->nft.af_info);
static int __net_init nf_tables_init_net(struct net *net)
{
INIT_LIST_HEAD(&net->nft.af_info);
@@
-1155,7
+1155,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
INIT_LIST_HEAD(&net->nft.commit_list);
net->nft.base_seq = 1;
return 0;
INIT_LIST_HEAD(&net->nft.commit_list);
net->nft.base_seq = 1;
return 0;
-@@ -65
69,10 +6554
,10 @@ static void __nft_release_afinfo(struct
+@@ -65
85,10 +6570
,10 @@ static void __nft_release_afinfo(struct
struct nft_set *set, *ns;
struct nft_ctx ctx = {
.net = net,
struct nft_set *set, *ns;
struct nft_ctx ctx = {
.net = net,
@@
-1255,7
+1255,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
par->nft_compat = true;
}
par->nft_compat = true;
}
-@@ -50
2,7 +502
,7 @@ __nft_match_destroy(const struct nft_ctx
+@@ -50
3,7 +503
,7 @@ __nft_match_destroy(const struct nft_ctx
par.net = ctx->net;
par.match = match;
par.matchinfo = info;
par.net = ctx->net;
par.match = match;
par.matchinfo = info;
@@
-1264,7
+1264,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
if (par.match->destroy != NULL)
par.match->destroy(&par);
if (par.match->destroy != NULL)
par.match->destroy(&par);
-@@ -73
2,7 +732
,7 @@ nft_match_select_ops(const struct nft_ct
+@@ -73
3,7 +733
,7 @@ nft_match_select_ops(const struct nft_ct
mt_name = nla_data(tb[NFTA_MATCH_NAME]);
rev = ntohl(nla_get_be32(tb[NFTA_MATCH_REV]));
mt_name = nla_data(tb[NFTA_MATCH_NAME]);
rev = ntohl(nla_get_be32(tb[NFTA_MATCH_REV]));
@@
-1273,7
+1273,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
/* Re-use the existing match if it's already loaded. */
list_for_each_entry(nft_match, &nft_match_list, head) {
/* Re-use the existing match if it's already loaded. */
list_for_each_entry(nft_match, &nft_match_list, head) {
-@@ -82
3,7 +823
,7 @@ nft_target_select_ops(const struct nft_c
+@@ -82
4,7 +824
,7 @@ nft_target_select_ops(const struct nft_c
tg_name = nla_data(tb[NFTA_TARGET_NAME]);
rev = ntohl(nla_get_be32(tb[NFTA_TARGET_REV]));
tg_name = nla_data(tb[NFTA_TARGET_NAME]);
rev = ntohl(nla_get_be32(tb[NFTA_TARGET_REV]));