network: reap child in all cases

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/network.c b/src/lxc/network.c
index da62594478e2a64627570b6bdb65b47774b63af2..49114727d0fa8b960dedd152fc4e38c525cf14e6 100644 (file)
--- a/src/lxc/network.c
+++ b/src/lxc/network.c
@@ -2126,13 +2126,13 @@ static int lxc_create_network_unpriv_exec(const char *lxcpath, const char *lxcna
        if (bytes < 0) {
                SYSERROR("Failed to read from pipe file descriptor");
                close(pipefd[0]);
-               return -1;
+       } else {
+               buffer[bytes - 1] = '\0';
        }
-       buffer[bytes - 1] = '\0';
 
        ret = wait_for_pid(child);
        close(pipefd[0]);
-       if (ret != 0) {
+       if (ret != 0 || bytes < 0) {
                ERROR("lxc-user-nic failed to configure requested network: %s",
                      buffer[0] != '\0' ? buffer : "(null)");
                return -1;
@@ -2267,19 +2267,18 @@ static int lxc_delete_network_unpriv_exec(const char *lxcpath, const char *lxcna
        if (bytes < 0) {
                SYSERROR("Failed to read from pipe file descriptor.");
                close(pipefd[0]);
-               return -1;
+       } else {
+               buffer[bytes - 1] = '\0';
        }
-       buffer[bytes - 1] = '\0';
 
-       if (wait_for_pid(child) != 0) {
+       ret = wait_for_pid(child);
+       close(pipefd[0]);
+       if (ret != 0 || bytes < 0) {
                ERROR("lxc-user-nic failed to delete requested network: %s",
                      buffer[0] != '\0' ? buffer : "(null)");
-               close(pipefd[0]);
                return -1;
        }
 
-       close(pipefd[0]);
-
        return 0;
 }