diff mbox series

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

Message ID 1620756666-77834-1-git-send-email-danielj@nvidia.com
State New
Headers show
Series [SRU,F:linux-bluefield] netfilter: flowtable: Free block_cb when being deleted | expand

Commit Message

Daniel Jurgens May 11, 2021, 6:11 p.m. UTC 
From: Roi Dayan <roid@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@mellanox.com>
Reviewed-by: Paul Blakey <paulb@mellanox.com>
Reviewed-by: Oz Shlomo <ozsh@mellanox.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
(backported from commit bc8e71314e8444c6315c482441f3204c032ab327)
Signed-off-by: Daniel Jurgens <danielj@nvidia.com>

Conflicts:
	net/netfilter/nf_flow_table_core.c
---
 net/netfilter/nf_flow_table_core.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Stefan Bader May 12, 2021, 9:27 a.m. UTC | #1 
On 11.05.21 20:11, Daniel Jurgens wrote:
> From: Roi Dayan <roid@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@mellanox.com>
> Reviewed-by: Paul Blakey <paulb@mellanox.com>
> Reviewed-by: Oz Shlomo <ozsh@mellanox.com>
> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
> (backported from commit bc8e71314e8444c6315c482441f3204c032ab327)
[danielj: <I guess context adjustments>]
> Signed-off-by: Daniel Jurgens <danielj@nvidia.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
> ---

Can be done when applying. I suppose it was to work around different context.

-Stefan

>   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);
>
Kleber Sacilotto de Souza May 12, 2021, 9:45 a.m. UTC | #2 
On 11.05.21 20:11, Daniel Jurgens wrote:
> From: Roi Dayan <roid@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@mellanox.com>
> Reviewed-by: Paul Blakey <paulb@mellanox.com>
> Reviewed-by: Oz Shlomo <ozsh@mellanox.com>
> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
> (backported from commit bc8e71314e8444c6315c482441f3204c032ab327)
> Signed-off-by: Daniel Jurgens <danielj@nvidia.com>

Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

Thanks


> 
> Conflicts:
> 	net/netfilter/nf_flow_table_core.c
> ---
>   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);
>
Kelsey Skunberg May 29, 2021, 12:24 a.m. UTC | #3 
This is on the mailing list twice. NACKing this one and the other is
ready to apply. Will forward Stefan's comment. 

-Kelsey

On 2021-05-11 21:11:06 , Daniel Jurgens wrote:
> From: Roi Dayan <roid@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@mellanox.com>
> Reviewed-by: Paul Blakey <paulb@mellanox.com>
> Reviewed-by: Oz Shlomo <ozsh@mellanox.com>
> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
> (backported from commit bc8e71314e8444c6315c482441f3204c032ab327)
> Signed-off-by: Daniel Jurgens <danielj@nvidia.com>
> 
> Conflicts:
> 	net/netfilter/nf_flow_table_core.c
> ---
>  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@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
diff mbox series

Patch

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);