patch 'net/sfc: fix use after free in debug logs' has been queued to stable release 21.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/02/24. 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/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/c9e55a5817d6b66954476defc0e945169be059e8

Thanks.

Kevin

---
>From c9e55a5817d6b66954476defc0e945169be059e8 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Tue, 8 Oct 2024 09:47:13 -0700
Subject: [PATCH] net/sfc: fix use after free in debug logs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 757b0b6f207c072a550f43836856235aa41553ad ]

If compiler detection of use-after-free is enabled then this drivers
debug messages will cause warnings. Change to move debug message
before the object is freed.

Bugzilla ID: 1551
Fixes: 55c1238246d5 ("net/sfc: add more debug messages to transfer flows")

Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
Reviewed-by: Ivan Malov <ivan.malov at arknetworks.am>
Acked-by: Andrew Rybchenko <andrew.rybchenko at oktetlabs.ru>
Acked-by: Morten Brørup <mb at smartsharesystems.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev at huawei.com>
Acked-by: Wathsala Vithanage <wathsala.vithanage at arm.com>
---
 drivers/net/sfc/sfc_mae.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c
index eb97524dc3..3d98d4dba8 100644
--- a/drivers/net/sfc/sfc_mae.c
+++ b/drivers/net/sfc/sfc_mae.c
@@ -422,7 +422,6 @@ sfc_mae_outer_rule_del(struct sfc_adapter *sa,
 
 	TAILQ_REMOVE(&mae->outer_rules, rule, entries);
-	rte_free(rule);
-
 	sfc_dbg(sa, "deleted outer_rule=%p", rule);
+	rte_free(rule);
 }
 
@@ -583,7 +582,6 @@ sfc_mae_mac_addr_del(struct sfc_adapter *sa, struct sfc_mae_mac_addr *mac_addr)
 
 	TAILQ_REMOVE(&mae->mac_addrs, mac_addr, entries);
-	rte_free(mac_addr);
-
 	sfc_dbg(sa, "deleted mac_addr=%p", mac_addr);
+	rte_free(mac_addr);
 }
 
@@ -780,8 +778,8 @@ sfc_mae_encap_header_del(struct sfc_adapter *sa,
 
 	TAILQ_REMOVE(&mae->encap_headers, encap_header, entries);
+	sfc_dbg(sa, "deleted encap_header=%p", encap_header);
+
 	rte_free(encap_header->buf);
 	rte_free(encap_header);
-
-	sfc_dbg(sa, "deleted encap_header=%p", encap_header);
 }
 
@@ -1086,7 +1084,6 @@ sfc_mae_action_set_del(struct sfc_adapter *sa,
 	}
 	TAILQ_REMOVE(&mae->action_sets, action_set, entries);
-	rte_free(action_set);
-
 	sfc_dbg(sa, "deleted action_set=%p", action_set);
+	rte_free(action_set);
 }
 
-- 
2.47.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-11-27 17:17:38.739827222 +0000
+++ 0013-net-sfc-fix-use-after-free-in-debug-logs.patch	2024-11-27 17:17:38.170269088 +0000
@@ -1 +1 @@
-From 757b0b6f207c072a550f43836856235aa41553ad Mon Sep 17 00:00:00 2001
+From c9e55a5817d6b66954476defc0e945169be059e8 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 757b0b6f207c072a550f43836856235aa41553ad ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -24,3 +25,2 @@
- drivers/net/sfc/sfc_flow_rss.c |  4 ++--
- drivers/net/sfc/sfc_mae.c      | 25 ++++++++++---------------
- 2 files changed, 12 insertions(+), 17 deletions(-)
+ drivers/net/sfc/sfc_mae.c | 13 +++++--------
+ 1 file changed, 5 insertions(+), 8 deletions(-)
@@ -28,14 +27,0 @@
-diff --git a/drivers/net/sfc/sfc_flow_rss.c b/drivers/net/sfc/sfc_flow_rss.c
-index e28c943335..8e2749833b 100644
---- a/drivers/net/sfc/sfc_flow_rss.c
-+++ b/drivers/net/sfc/sfc_flow_rss.c
-@@ -304,7 +304,7 @@ sfc_flow_rss_ctx_del(struct sfc_adapter *sa, struct sfc_flow_rss_ctx *ctx)
- 	TAILQ_REMOVE(&flow_rss->ctx_list, ctx, entries);
- 	rte_free(ctx->qid_offsets);
--	rte_free(ctx);
--
- 	sfc_dbg(sa, "flow-rss: deleted ctx=%p", ctx);
-+
-+	rte_free(ctx);
- }
- 
@@ -43 +29 @@
-index 60ff6d2181..8f74f10390 100644
+index eb97524dc3..3d98d4dba8 100644
@@ -46 +32 @@
-@@ -401,7 +401,6 @@ sfc_mae_outer_rule_del(struct sfc_adapter *sa,
+@@ -422,7 +422,6 @@ sfc_mae_outer_rule_del(struct sfc_adapter *sa,
@@ -55 +41 @@
-@@ -586,7 +585,6 @@ sfc_mae_mac_addr_del(struct sfc_adapter *sa, struct sfc_mae_mac_addr *mac_addr)
+@@ -583,7 +582,6 @@ sfc_mae_mac_addr_del(struct sfc_adapter *sa, struct sfc_mae_mac_addr *mac_addr)
@@ -64 +50 @@
-@@ -786,8 +784,8 @@ sfc_mae_encap_header_del(struct sfc_adapter *sa,
+@@ -780,8 +778,8 @@ sfc_mae_encap_header_del(struct sfc_adapter *sa,
@@ -67,4 +53 @@
--	rte_free(encap_header->buf);
--	rte_free(encap_header);
--
- 	sfc_dbg(sa, "deleted encap_header=%p", encap_header);
++	sfc_dbg(sa, "deleted encap_header=%p", encap_header);
@@ -72,8 +55,2 @@
-+	rte_free(encap_header->buf);
-+	rte_free(encap_header);
- }
- 
-@@ -984,7 +982,6 @@ sfc_mae_counter_del(struct sfc_adapter *sa, struct sfc_mae_counter *counter)
- 
- 	TAILQ_REMOVE(&mae->counters, counter, entries);
--	rte_free(counter);
+ 	rte_free(encap_header->buf);
+ 	rte_free(encap_header);
@@ -81,2 +58 @@
- 	sfc_dbg(sa, "deleted counter=%p", counter);
-+	rte_free(counter);
+-	sfc_dbg(sa, "deleted encap_header=%p", encap_header);
@@ -85,2 +61,2 @@
-@@ -1166,7 +1163,6 @@ sfc_mae_action_set_del(struct sfc_adapter *sa,
- 	sfc_mae_counter_del(sa, action_set->counter);
+@@ -1086,7 +1084,6 @@ sfc_mae_action_set_del(struct sfc_adapter *sa,
+ 	}
@@ -92,20 +67,0 @@
- }
- 
-@@ -1402,8 +1398,8 @@ sfc_mae_action_set_list_del(struct sfc_adapter *sa,
- 
- 	TAILQ_REMOVE(&mae->action_set_lists, action_set_list, entries);
-+	sfc_dbg(sa, "deleted action_set_list=%p", action_set_list);
-+
- 	rte_free(action_set_list->action_sets);
- 	rte_free(action_set_list);
--
--	sfc_dbg(sa, "deleted action_set_list=%p", action_set_list);
- }
- 
-@@ -1668,7 +1664,6 @@ sfc_mae_action_rule_del(struct sfc_adapter *sa,
- 
- 	TAILQ_REMOVE(&mae->action_rules, rule, entries);
--	rte_free(rule);
--
- 	sfc_dbg(sa, "deleted action_rule=%p", rule);
-+	rte_free(rule);