CMT: [SRU][F:linux-bluefield][PATCH] netfilter: flowtable: Free block_cb when being deleted

[Kelsey Skunberg]

On 2021-05-19 00:42:24 , Daniel Jurgens wrote:
> From: Roi Dayan <roid at mellanox.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1927252
> 
> Free block_cb memory when asked to be deleted.
> 
> Fixes: 978703f42549 ("netfilter: flowtable: Add API for registering to flow table events")
> Signed-off-by: Roi Dayan <roid at mellanox.com>
> Reviewed-by: Paul Blakey <paulb at mellanox.com>
> Reviewed-by: Oz Shlomo <ozsh at mellanox.com>
> Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
> (backported from commit bc8e71314e8444c6315c482441f3204c032ab327)
[danielj: <I guess context adjustments>]
> Signed-off-by: Daniel Jurgens <danielj at nvidia.com>
> 

This patch was on the mailing list twice. Stefan reviewed the other one
and requested a line like the above gets included when applying please. 

-Kelsey

> ---
>  net/netfilter/nf_flow_table_core.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/net/netfilter/nf_flow_table_core.c b/net/netfilter/nf_flow_table_core.c
> index 5144e31..0336117 100644
> --- a/net/netfilter/nf_flow_table_core.c
> +++ b/net/netfilter/nf_flow_table_core.c
> @@ -427,10 +427,12 @@ void nf_flow_table_offload_del_cb(struct nf_flowtable *flow_table,
>  
>  	mutex_lock(&flow_table->flow_block_lock);
>  	block_cb = flow_block_cb_lookup(block, cb, cb_priv);
> -	if (block_cb)
> +	if (block_cb) {
>  		list_del(&block_cb->list);
> -	else
> +		flow_block_cb_free(block_cb);
> +	} else {
>  		WARN_ON(true);
> +	}
>  	mutex_unlock(&flow_table->flow_block_lock);
>  }
>  EXPORT_SYMBOL_GPL(nf_flow_table_offload_del_cb);
> -- 
> 1.8.3.1
> 
> 
> -- 
> kernel-team mailing list
> kernel-team at lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team