diff options
| author | Chris Mi <cmi@nvidia.com> | 2020-12-08 10:48:35 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-21 13:28:17 +0100 |
| commit | facb39d8ac8f690d07090724120bccd2ea3c0781 (patch) | |
| tree | 63a01c3c5fb409efdd376e07f82ef7730114a029 | |
| parent | f9c84d022929be7c15747ab1fc8696e5271ccc60 (diff) | |
| download | linux-stable-facb39d8ac8f690d07090724120bccd2ea3c0781.tar.gz linux-stable-facb39d8ac8f690d07090724120bccd2ea3c0781.tar.bz2 linux-stable-facb39d8ac8f690d07090724120bccd2ea3c0781.zip | |
net: flow_offload: Fix memory leak for indirect flow block
[ Upstream commit 5137d303659d8c324e67814b1cc2e1bc0c0d9836 ]
The offending commit introduces a cleanup callback that is invoked
when the driver module is removed to clean up the tunnel device
flow block. But it returns on the first iteration of the for loop.
The remaining indirect flow blocks will never be freed.
Fixes: 1fac52da5942 ("net: flow_offload: consolidate indirect flow_block infrastructure")
CC: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Chris Mi <cmi@nvidia.com>
Reviewed-by: Roi Dayan <roid@nvidia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/core/flow_offload.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/core/flow_offload.c b/net/core/flow_offload.c index d4474c812b64..715b67f6c62f 100644 --- a/net/core/flow_offload.c +++ b/net/core/flow_offload.c @@ -381,10 +381,8 @@ static void __flow_block_indr_cleanup(void (*release)(void *cb_priv), list_for_each_entry_safe(this, next, &flow_block_indr_list, indr.list) { if (this->release == release && - this->indr.cb_priv == cb_priv) { + this->indr.cb_priv == cb_priv) list_move(&this->indr.list, cleanup_list); - return; - } } } |