Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2025-02-18 09:10:38 +01:00
Code Releases Activity

main: Fix failure cleanup sequence

Browse Source
This commit is contained in:
Tim Kourt 2020-04-08 18:44:16 -07:00 committed by Denis Kenzior
parent f92ce9441e
commit 19a5250b34
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main.c
View File

@ -476,12 +476,12 @@ int main(int argc, char *argv[])
exit_status = EXIT_FAILURE; exit_status = EXIT_FAILURE;
if (!storage_create_dirs()) if (!storage_create_dirs())
goto fail_dbus; goto failed_dirs;
genl = l_genl_new(); genl = l_genl_new();
if (!genl) { if (!genl) {
l_error("Failed to open generic netlink socket"); l_error("Failed to open generic netlink socket");
goto fail_genl; goto failed_genl;
} }
if (getenv("IWD_GENL_DEBUG")) if (getenv("IWD_GENL_DEBUG"))
@ -490,7 +490,7 @@ int main(int argc, char *argv[])
rtnl = l_netlink_new(NETLINK_ROUTE); rtnl = l_netlink_new(NETLINK_ROUTE);
if (!rtnl) { if (!rtnl) {
l_error("Failed to open route netlink socket"); l_error("Failed to open route netlink socket");
goto fail_rtnl; goto failed_rtnl;
} }
if (getenv("IWD_RTNL_DEBUG")) if (getenv("IWD_RTNL_DEBUG"))
@ -499,7 +499,7 @@ int main(int argc, char *argv[])
dbus = l_dbus_new_default(L_DBUS_SYSTEM_BUS); dbus = l_dbus_new_default(L_DBUS_SYSTEM_BUS);
if (!dbus) { if (!dbus) {
l_error("Failed to initialize D-Bus"); l_error("Failed to initialize D-Bus");
goto fail_dbus; goto failed_dbus;
} }
if (enable_dbus_debug) if (enable_dbus_debug)
@ -510,18 +510,24 @@ int main(int argc, char *argv[])
dbus_init(dbus); dbus_init(dbus);
exit_status = l_main_run_with_signal(signal_handler, NULL); exit_status = l_main_run_with_signal(signal_handler, NULL);
plugin_exit(); plugin_exit();
iwd_modules_exit(); iwd_modules_exit();
dbus_exit(); dbus_exit();
l_dbus_destroy(dbus); l_dbus_destroy(dbus);
storage_cleanup_dirs(); failed_dbus:
fail_dbus:
l_genl_unref(genl);
fail_rtnl:
l_netlink_destroy(rtnl); l_netlink_destroy(rtnl);
fail_genl: failed_rtnl:
l_genl_unref(genl);
failed_genl:
storage_cleanup_dirs();
failed_dirs:
l_settings_free(iwd_config); l_settings_free(iwd_config);
l_timeout_remove(timeout); l_timeout_remove(timeout);