Skip to contentSkip to conversation

hwsim: properly cleanup rules queue

PATCH Applied James Prestwood 2 participants 2 messages Apr 10, 2023 – Apr 16, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hwsim: properly cleanup rules queue

After adding prefix matching the rule structure contained allocated memory which was not being cleaned up on exit if rules still remained in the list (removing the rule via DBus was done correctly)

---
 tools/hwsim.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)
tools/hwsim.c +15 -7
index 7afbe4e7..47352ad4 100644
@@ -2092,6 +2092,19 @@ static void setup_rule_manager_interface(struct l_dbus_interface *interface)
 				rule_add, "o", "", "path");
 }
 
+static void destroy_rule(void *user_data)
+{
+	struct hwsim_rule *rule = user_data;
+
+	if (rule->prefix)
+		l_free(rule->prefix);
+
+	if (rule->match)
+		l_free(rule->match);
+
+	l_free(rule);
+}
+
 static struct l_dbus_message *rule_remove(struct l_dbus *dbus,
 						struct l_dbus_message *message,
 						void *user_data)
@@ -2102,13 +2115,8 @@ static struct l_dbus_message *rule_remove(struct l_dbus *dbus,
 	path = rule_get_path(rule);
 	l_queue_remove(rules, rule);
 
-	if (rule->prefix)
-		l_free(rule->prefix);
+	destroy_rule(rule);
 
-	if (rule->match)
-		l_free(rule->match);
-
-	l_free(rule);
 	l_dbus_unregister_object(dbus, path);
 
 	return l_dbus_message_new_method_return(message);
@@ -3131,7 +3139,7 @@ int main(int argc, char *argv[])
 
 	l_dbus_destroy(dbus);
 	hwsim_radio_cache_cleanup();
-	l_queue_destroy(rules, l_free);
+	l_queue_destroy(rules, destroy_rule);
 
 	l_netlink_destroy(rtnl);
 
Signature · 1 line
2.25.1
#1 lore raw

Hi James,

Quoted 7 lines · James Prestwood

After adding prefix matching the rule structure contained allocated memory which was not being cleaned up on exit if rules still remained in the list (removing the rule via DBus was done correctly)

---
  tools/hwsim.c | 22 +++++++++++++++-------
  1 file changed, 15 insertions(+), 7 deletions(-)

Applied, thanks.

Regards,
-Denis