discover/device-handler: Fix use-after-free when unmounting

[petitboot] / discover / pb-discover.c

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index c16d6903ed5c1da180dfd615beed1950c824b20b..ccd1c7daba597441c9df3dac3e67f89ed2aeab50 100644 (file)
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -158,11 +158,6 @@ int main(int argc, char *argv[])
 
        signal(SIGINT, sigint_handler);
 
-       config_init(NULL);
-
-       if (opts.no_autoboot == opt_yes)
-               config_set_autoboot(false);
-
        waitset = waitset_create(NULL);
 
        server = discover_server_init(waitset);
@@ -173,9 +168,9 @@ int main(int argc, char *argv[])
        if (!procset)
                return EXIT_FAILURE;
 
-       network = network_init(server, waitset, opts.dry_run == opt_yes);
-       if (!network)
-               return EXIT_FAILURE;
+       config_init(NULL);
+       if (opts.no_autoboot == opt_yes)
+               config_set_autoboot(false);
 
        handler = device_handler_init(server, waitset, opts.dry_run == opt_yes);
        if (!handler)
@@ -183,10 +178,15 @@ int main(int argc, char *argv[])
 
        discover_server_set_device_source(server, handler);
 
+       /* init our device sources: udev, network and user events */
        udev = udev_init(waitset, handler);
        if (!udev)
                return EXIT_FAILURE;
 
+       network = network_init(handler, waitset, opts.dry_run == opt_yes);
+       if (!network)
+               return EXIT_FAILURE;
+
        uev = user_event_init(waitset, handler);
        if (!uev)
                return EXIT_FAILURE;