5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vlad Buslov vladbu@nvidia.com
[ Upstream commit fc54d9065f90dd25063883f404e6ff9a76913e73 ]
Following patches in series use the pointer to access flow table offload debug variables.
Signed-off-by: Vlad Buslov vladbu@nvidia.com Signed-off-by: Oz Shlomo ozsh@nvidia.com Signed-off-by: Pablo Neira Ayuso pablo@netfilter.org Stable-dep-of: 88c67aeb1407 ("sched: act_ct: add netns into the key of tcf_ct_flow_table") Signed-off-by: Sasha Levin sashal@kernel.org --- net/sched/act_ct.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/net/sched/act_ct.c b/net/sched/act_ct.c index b4c42b257ae7c..0307b4366db10 100644 --- a/net/sched/act_ct.c +++ b/net/sched/act_ct.c @@ -276,7 +276,7 @@ static struct nf_flowtable_type flowtable_ct = { .owner = THIS_MODULE, };
-static int tcf_ct_flow_table_get(struct tcf_ct_params *params) +static int tcf_ct_flow_table_get(struct net *net, struct tcf_ct_params *params) { struct tcf_ct_flow_table *ct_ft; int err = -ENOMEM; @@ -302,6 +302,7 @@ static int tcf_ct_flow_table_get(struct tcf_ct_params *params) err = nf_flow_table_init(&ct_ft->nf_ft); if (err) goto err_init; + write_pnet(&ct_ft->nf_ft.net, net);
__module_get(THIS_MODULE); out_unlock: @@ -1304,7 +1305,7 @@ static int tcf_ct_init(struct net *net, struct nlattr *nla, if (err) goto cleanup;
- err = tcf_ct_flow_table_get(params); + err = tcf_ct_flow_table_get(net, params); if (err) goto cleanup_params;