[dpdk-stable] patch 'flow_classify: fix leaking rules on delete' has been queued to stable release 19.11.10

[christian.ehrhardt at canonical.com]

Hi,

FYI, your patch has been queued to stable release 19.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/12/21. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/0c6d3c0f8d17aa8da850dcc695aefc037152c11f

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 0c6d3c0f8d17aa8da850dcc695aefc037152c11f Mon Sep 17 00:00:00 2001
From: Owen Hilyard <ohilyard at iol.unh.edu>
Date: Wed, 23 Jun 2021 13:07:07 -0400
Subject: [PATCH] flow_classify: fix leaking rules on delete

[ upstream commit 016441e3c770b65774d658c94a82c5bf5ed826fe ]

Rules in a classify table were not freed if the table
had a delete function.

Fixes: be41ac2a330f ("flow_classify: introduce flow classify library")

Signed-off-by: Owen Hilyard <ohilyard at iol.unh.edu>
Acked-by: Bernard Iremonger <bernard.iremonger at intel.com>
---
 lib/librte_flow_classify/rte_flow_classify.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/librte_flow_classify/rte_flow_classify.c b/lib/librte_flow_classify/rte_flow_classify.c
index 5ff585803b..c7c57e17b6 100644
--- a/lib/librte_flow_classify/rte_flow_classify.c
+++ b/lib/librte_flow_classify/rte_flow_classify.c
@@ -584,12 +584,12 @@ rte_flow_classify_table_entry_delete(struct rte_flow_classifier *cls,
 						&rule->u.key.key_del,
 						&rule->key_found,
 						&rule->entry);
-
+				if (ret == 0)
+					free(rule);
 				return ret;
 			}
 		}
 	}
-	free(rule);
 	return ret;
 }
 
-- 
2.32.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-08-10 15:11:13.745844069 +0200
+++ 0017-flow_classify-fix-leaking-rules-on-delete.patch	2021-08-10 15:11:12.918637378 +0200
@@ -1 +1 @@
-From 016441e3c770b65774d658c94a82c5bf5ed826fe Mon Sep 17 00:00:00 2001
+From 0c6d3c0f8d17aa8da850dcc695aefc037152c11f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 016441e3c770b65774d658c94a82c5bf5ed826fe ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -15 +16 @@
- lib/flow_classify/rte_flow_classify.c | 4 ++--
+ lib/librte_flow_classify/rte_flow_classify.c | 4 ++--
@@ -18,5 +19,5 @@
-diff --git a/lib/flow_classify/rte_flow_classify.c b/lib/flow_classify/rte_flow_classify.c
-index f125267e8f..d3ba2ed227 100644
---- a/lib/flow_classify/rte_flow_classify.c
-+++ b/lib/flow_classify/rte_flow_classify.c
-@@ -579,12 +579,12 @@ rte_flow_classify_table_entry_delete(struct rte_flow_classifier *cls,
+diff --git a/lib/librte_flow_classify/rte_flow_classify.c b/lib/librte_flow_classify/rte_flow_classify.c
+index 5ff585803b..c7c57e17b6 100644
+--- a/lib/librte_flow_classify/rte_flow_classify.c
++++ b/lib/librte_flow_classify/rte_flow_classify.c
+@@ -584,12 +584,12 @@ rte_flow_classify_table_entry_delete(struct rte_flow_classifier *cls,