From: S.Çağlar Onur <caglar@10ur.org>
Date: Mon, 17 Feb 2014 20:08:18 +0000 (-0500)
Subject: close correct side of the pipe and increase buffer size by one to handle \n
X-Git-Tag: lxc-1.0.0.rc3~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe1f672ff83129cb7be4b718831dcd512b22a171;p=thirdparty%2Flxc.git

close correct side of the pipe and increase buffer size by one to handle \n

Signed-off-by: S.Çağlar Onur <caglar@10ur.org>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 10f46aef1..175a82f82 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -3011,13 +3011,14 @@ void lxc_delete_network(struct lxc_handler *handler)
 
 #define LXC_USERNIC_PATH LIBEXECDIR "/lxc/lxc-user-nic"
 
+/* lxc-user-nic returns "interface_name:interface_name\n" */
+#define MAX_BUFFER_SIZE IFNAMSIZ*2 + 2
 static int unpriv_assign_nic(struct lxc_netdev *netdev, pid_t pid)
 {
 	pid_t child;
 	int bytes, pipefd[2];
 	char *token, *saveptr = NULL;
-	/* lxc-user-nic returns "interface_name:interface_name" format */
-	char buffer[IFNAMSIZ*2 + 1];
+	char buffer[MAX_BUFFER_SIZE];
 
 	if (netdev->type != LXC_NET_VETH) {
 		ERROR("nic type %d not support for unprivileged use",
@@ -3043,7 +3044,7 @@ static int unpriv_assign_nic(struct lxc_netdev *netdev, pid_t pid)
 		/* redirect the stdout to write-end of the pipe */
 		dup2(pipefd[1], STDOUT_FILENO);
 		/* close the write-end of the pipe */
-		close(pipefd[0]);
+		close(pipefd[1]);
 
 		// Call lxc-user-nic pid type bridge
 		char pidstr[20];
@@ -3058,7 +3059,7 @@ static int unpriv_assign_nic(struct lxc_netdev *netdev, pid_t pid)
 	/* close the write-end of the pipe */
 	close(pipefd[1]);
 
-	bytes = read(pipefd[0], &buffer, IFNAMSIZ*2 + 1);
+	bytes = read(pipefd[0], &buffer, MAX_BUFFER_SIZE);
 	if (bytes < 0) {
 		SYSERROR("read failed");
 	}