bus: when getting a kdbus connection into a container wait first for child, then read message

There's no EOF generated for AF_UNIX/SOCK_DGRAM sockets, hence let's wait for the child first to see if it succeeded, only then read the socket.
2013-12-23 19:10:11 +01:00
parent e7f7a1b022
commit fbadf04511
3 changed files with 23 additions and 23 deletions
@@ -1174,14 +1174,14 @@ static int get_boot_id_for_machine(const char *machine, sd_id128_t *boot_id) {
        close_nointr_nofail(pair[1]);
        pair[1] = -1;

-        k = recv(pair[0], buf, 36, 0);
-        if (k != 36)
-                return -EIO;
-
        r = wait_for_terminate(child, &si);
        if (r < 0 || si.si_code != CLD_EXITED || si.si_status != EXIT_SUCCESS)
                return r < 0 ? r : -EIO;

+        k = recv(pair[0], buf, 36, 0);
+        if (k != 36)
+                return -EIO;
+
        buf[36] = 0;
        r = sd_id128_from_string(buf, boot_id);
        if (r < 0)