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")
Cc: ivan.ma...@oktetlabs.ru
Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
---
drivers/net/sfc/sfc_flow_rss.c | 4 ++--
drivers/net/sfc/sfc_mae.c | 23 +++++++++--------------
2 files changed, 11 insertions(+), 16 deletions(-)
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
@@ -303,9 +303,9 @@ 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);
}
static int
diff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c
index 60ff6d2181..8f74f10390 100644
--- a/drivers/net/sfc/sfc_mae.c
+++ b/drivers/net/sfc/sfc_mae.c
@@ -400,9 +400,8 @@ sfc_mae_outer_rule_del(struct sfc_adapter *sa,
efx_mae_match_spec_fini(sa->nic, rule->match_spec);
TAILQ_REMOVE(&mae->outer_rules, rule, entries);
- rte_free(rule);
-
sfc_dbg(sa, "deleted outer_rule=%p", rule);
+ rte_free(rule);
}
static int
@@ -585,9 +584,8 @@ 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);
}
enum sfc_mae_mac_addr_type {
@@ -785,10 +783,10 @@ 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);
}
static int
@@ -983,9 +981,8 @@ sfc_mae_counter_del(struct sfc_adapter *sa, struct
sfc_mae_counter *counter)
}
TAILQ_REMOVE(&mae->counters, counter, entries);
- rte_free(counter);
-
sfc_dbg(sa, "deleted counter=%p", counter);
+ rte_free(counter);
}
static int
@@ -1165,9 +1162,8 @@ sfc_mae_action_set_del(struct sfc_adapter *sa,
sfc_mae_mac_addr_del(sa, action_set->src_mac_addr);
sfc_mae_counter_del(sa, action_set->counter);
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);
}
static int
@@ -1401,10 +1397,10 @@ sfc_mae_action_set_list_del(struct sfc_adapter *sa,
sfc_mae_action_set_del(sa, action_set_list->action_sets[i]);
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);
}
static int
@@ -1667,9 +1663,8 @@ sfc_mae_action_rule_del(struct sfc_adapter *sa,
sfc_mae_outer_rule_del(sa, rule->outer_rule);
TAILQ_REMOVE(&mae->action_rules, rule, entries);
- rte_free(rule);
-
sfc_dbg(sa, "deleted action_rule=%p", rule);
+ rte_free(rule);
}
static int
--
2.45.2