Merge pull request #1782 from brauner/2017-09-04/fix_tty_sending

src/lxc/conf.c

@@ -3072,6 +3072,9 @@ static int lxc_send_ttys_to_parent(struct lxc_handler *handler)
 	int sock = handler->data_sock[0];
 	int ret = -1;
 
+	if (!conf->tty)
+		return 0;
+
 	for (i = 0; i < conf->tty; i++) {
 		int ttyfds[2];
 		struct lxc_pty_info *pty_info = &tty_info->pty_info[i];
@@ -3093,8 +3096,6 @@ static int lxc_send_ttys_to_parent(struct lxc_handler *handler)
 	else
 		TRACE("Sent %d ttys to parent", conf->tty);
 
-	close(handler->data_sock[0]);
-	close(handler->data_sock[1]);
 	lxc_delete_tty(tty_info);
 
 	return ret;

src/lxc/network.c

@@ -3003,14 +3003,9 @@ int lxc_network_send_veth_names_to_child(struct lxc_handler *handler)
 			continue;
 
 		ret = send(data_sock, netdev->name, IFNAMSIZ, 0);
-		if (ret < 0) {
-			close(handler->data_sock[0]);
-			close(handler->data_sock[1]);
+		if (ret < 0)
 			return -1;
-		} else {
-			TRACE("Sent network device name \"%s\" to child",
-			      netdev->name);
-		}
+		TRACE("Sent network device name \"%s\" to child", netdev->name);
 	}
 
 	return 0;
@@ -3033,14 +3028,9 @@ int lxc_network_recv_veth_names_from_parent(struct lxc_handler *handler)
 			continue;
 
 		ret = recv(data_sock, netdev->name, IFNAMSIZ, 0);
-		if (ret < 0) {
-			close(handler->data_sock[0]);
-			close(handler->data_sock[1]);
+		if (ret < 0)
 			return -1;
-		} else {
-			TRACE("Received network device name \"%s\" from parent",
-			      netdev->name);
-		}
+		TRACE("Received network device name \"%s\" from parent", netdev->name);
 	}
 
 	return 0;
@@ -3062,23 +3052,18 @@ int lxc_network_send_name_and_ifindex_to_parent(struct lxc_handler *handler)
 		/* Send network device name in the child's namespace to parent. */
 		ret = send(data_sock, netdev->name, IFNAMSIZ, 0);
 		if (ret < 0)
-			goto on_error;
+			return -1;
 
 		/* Send network device ifindex in the child's namespace to
 		 * parent.
 		 */
 		ret = send(data_sock, &netdev->ifindex, sizeof(netdev->ifindex), 0);
 		if (ret < 0)
-			goto on_error;
+			return -1;
 	}
 
 	TRACE("Sent network device names and ifindeces to parent");
 	return 0;
-
-on_error:
-	close(handler->data_sock[0]);
-	close(handler->data_sock[1]);
-	return -1;
 }
 
 int lxc_network_recv_name_and_ifindex_from_child(struct lxc_handler *handler)
@@ -3099,20 +3084,15 @@ int lxc_network_recv_name_and_ifindex_from_child(struct lxc_handler *handler)
 		 */
 		ret = recv(data_sock, netdev->name, IFNAMSIZ, 0);
 		if (ret < 0)
-			goto on_error;
+			return -1;
 
 		/* Receive network device ifindex in the child's namespace to
 		 * parent.
 		 */
 		ret = recv(data_sock, &netdev->ifindex, sizeof(netdev->ifindex), 0);
 		if (ret < 0)
-			goto on_error;
+			return -1;
 	}
 
 	return 0;
-
-on_error:
-	close(handler->data_sock[0]);
-	close(handler->data_sock[1]);
-	return -1;
 }

src/lxc/start.c

@@ -912,7 +912,10 @@ static int do_start(void *data)
 	}
 
 	/* Setup the container, ip, names, utsname, ... */
-	if (lxc_setup(handler)) {
+	ret = lxc_setup(handler);
+	close(handler->data_sock[0]);
+	close(handler->data_sock[1]);
+	if (ret < 0) {
 		ERROR("Failed to setup container \"%s\".", handler->name);
 		goto out_warn_father;
 	}