diff options
| author |   wenxu <wenxu@ucloud.cn> | 2020-06-18 20:49:10 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-06-19 20:12:58 -0700 |
| commit | a1db217861f33b8d9ea8171bcacee51186e2d5ba (patch) | |
| tree | 6719e7474a02c935b8d296f550de67ddb7290945 /net/netfilter/nf_tables_offload.c | |
| parent | flow_offload: use flow_indr_block_cb_alloc/remove function (diff) | |
| download | linux-dev-a1db217861f33b8d9ea8171bcacee51186e2d5ba.tar.xz linux-dev-a1db217861f33b8d9ea8171bcacee51186e2d5ba.zip | |
net: flow_offload: fix flow_indr_dev_unregister path
If the representor is removed, then identify the indirect flow_blocks
that need to be removed by the release callback and the port representor
structure. To identify the port representor structure, a new
indr.cb_priv field needs to be introduced. The flow_block also needs to
be removed from the driver list from the cleanup path.
Fixes: 1fac52da5942 ("net: flow_offload: consolidate indirect flow_block infrastructure")
Signed-off-by: wenxu <wenxu@ucloud.cn>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_tables_offload.c')
| -rw-r--r-- | net/netfilter/nf_tables_offload.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/netfilter/nf_tables_offload.c b/net/netfilter/nf_tables_offload.c index 185fc82c99aa..c7cf1cde46de 100644 --- a/net/netfilter/nf_tables_offload.c +++ b/net/netfilter/nf_tables_offload.c @@ -296,6 +296,7 @@ static void nft_indr_block_cleanup(struct flow_block_cb *block_cb) nft_flow_block_offload_init(&bo, dev_net(dev), FLOW_BLOCK_UNBIND, basechain, &extack); mutex_lock(&net->nft.commit_mutex); + list_del(&block_cb->driver_list); list_move(&block_cb->list, &bo.cb_list); nft_flow_offload_unbind(&bo, basechain); mutex_unlock(&net->nft.commit_mutex); |