projects
/
openwrt
/
staging
/
wigyori.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.164
[openwrt/staging/wigyori.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 9108a5e4dcef4dea8c144d1a7dd6a627cf5477f7..340d7167ea6fd677e38611e629cb9443847280f8 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
@@
-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);
-@@ -
3996,7 +3982
,7 @@ static int nft_add_set_elem(struct nft_c
+@@ -
4002,7 +3988
,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
48,7 +4534
,8 @@ static int nf_tables_newobj(struct net *
+@@ -45
54,7 +4540
,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
66,7 +4553
,7 @@ static int nf_tables_newobj(struct net *
+@@ -45
72,7 +4559
,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))
-@@ -464
3,7 +4630
,6 @@ struct nft_obj_filter {
+@@ -464
9,7 +4636
,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
58,38 +4644
,37 @@ static int nf_tables_dump_obj(struct sk_
+@@ -46
64,38 +4650
,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
76,7 +4761
,8 @@ static int nf_tables_getobj(struct net *
+@@ -47
82,7 +4767
,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);
-@@ -48
36,7 +4822
,8 @@ static int nf_tables_delobj(struct net *
+@@ -48
42,7 +4828
,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
47,7 +4834
,7 @@ static int nf_tables_delobj(struct net *
+@@ -48
53,7 +4840
,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
85,7 +4872
,7 @@ static void nf_tables_obj_notify(const s
+@@ -48
91,7 +4878
,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
75,7 +5062
,7 @@ void nft_flow_table_iterate(struct net *
+@@ -50
81,7 +5068
,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);
}
-@@ -512
3,7 +5110
,8 @@ static int nf_tables_newflowtable(struct
+@@ -512
9,7 +5116
,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);
-@@ -514
0,7 +5128
,7 @@ static int nf_tables_newflowtable(struct
+@@ -514
6,7 +5134
,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)
-@@ -522
1,7 +5209
,8 @@ static int nf_tables_delflowtable(struct
+@@ -522
7,7 +5215
,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);
-@@ -523
2,7 +5221
,7 @@ static int nf_tables_delflowtable(struct
+@@ -523
8,7 +5227
,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);
}
-@@ -530
1,40 +5290
,37 @@ static int nf_tables_dump_flowtable(stru
+@@ -530
7,40 +5296
,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:
-@@ -54
19,7 +5405
,8 @@ static int nf_tables_getflowtable(struct
+@@ -54
25,7 +5411
,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);
-@@ -546
2,7 +5449
,7 @@ static void nf_tables_flowtable_notify(s
+@@ -546
8,7 +5455
,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;
-@@ -554
0,17 +5527
,14 @@ static int nf_tables_flowtable_event(str
+@@ -554
6,17 +5533
,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
76,6 +6560
,7 @@ EXPORT_SYMBOL_GPL(nft_data_dump);
+@@ -65
82,6 +6566
,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;
-@@ -661
2,10 +6597
,10 @@ static void __nft_release_afinfo(struct
+@@ -661
8,10 +6603
,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,