net/sched: act_ct: set 'net' pointer when creating new nf_flow_table
[ 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>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
3eb1b39627
commit
b4899d75b8
@@ -275,7 +275,7 @@ static struct nf_flowtable_type flowtable_ct = {
|
|||||||
.owner = THIS_MODULE,
|
.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;
|
struct tcf_ct_flow_table *ct_ft;
|
||||||
int err = -ENOMEM;
|
int err = -ENOMEM;
|
||||||
@@ -300,6 +300,7 @@ static int tcf_ct_flow_table_get(struct tcf_ct_params *params)
|
|||||||
err = nf_flow_table_init(&ct_ft->nf_ft);
|
err = nf_flow_table_init(&ct_ft->nf_ft);
|
||||||
if (err)
|
if (err)
|
||||||
goto err_init;
|
goto err_init;
|
||||||
|
write_pnet(&ct_ft->nf_ft.net, net);
|
||||||
|
|
||||||
__module_get(THIS_MODULE);
|
__module_get(THIS_MODULE);
|
||||||
out_unlock:
|
out_unlock:
|
||||||
@@ -1291,7 +1292,7 @@ static int tcf_ct_init(struct net *net, struct nlattr *nla,
|
|||||||
if (err)
|
if (err)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
err = tcf_ct_flow_table_get(params);
|
err = tcf_ct_flow_table_get(net, params);
|
||||||
if (err)
|
if (err)
|
||||||
goto cleanup_params;
|
goto cleanup_params;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user