Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-21 22:09:23 +01:00
Code Releases Activity

hwsim: properly cleanup rules queue

Browse Source 
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)
This commit is contained in:
James Prestwood 2023-04-10 10:12:32 -07:00 committed by Denis Kenzior
parent 8465dddcab
commit 44a37d7eae
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tools/hwsim.c
View File

@ -2092,6 +2092,19 @@ static void setup_rule_manager_interface(struct l_dbus_interface *interface)
rule_add, "o", "", "path"); 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, static struct l_dbus_message *rule_remove(struct l_dbus *dbus,
struct l_dbus_message *message, struct l_dbus_message *message,
void *user_data) void *user_data)
@ -2102,13 +2115,8 @@ static struct l_dbus_message *rule_remove(struct l_dbus *dbus,
path = rule_get_path(rule); path = rule_get_path(rule);
l_queue_remove(rules, rule); l_queue_remove(rules, rule);
if (rule->prefix) destroy_rule(rule);
l_free(rule->prefix);
if (rule->match)
l_free(rule->match);
l_free(rule);
l_dbus_unregister_object(dbus, path); l_dbus_unregister_object(dbus, path);
return l_dbus_message_new_method_return(message); return l_dbus_message_new_method_return(message);
@ -3131,7 +3139,7 @@ int main(int argc, char *argv[])
l_dbus_destroy(dbus); l_dbus_destroy(dbus);
hwsim_radio_cache_cleanup(); hwsim_radio_cache_cleanup();
l_queue_destroy(rules, l_free); l_queue_destroy(rules, destroy_rule);
l_netlink_destroy(rtnl); l_netlink_destroy(rtnl);