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

Daniel Jurgens danielj at nvidia.com
Tue Jun 1 21:25:26 UTC 2021

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: backported because of the flow_block_lock change from mutex]
Signed-off-by: Daniel Jurgens <danielj at nvidia.com>

 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,
 	block_cb = flow_block_cb_lookup(block, cb, cb_priv);
-	if (block_cb)
+	if (block_cb) {
-	else
+		flow_block_cb_free(block_cb);
+	} else {
+	}

More information about the kernel-team mailing list