From: Christian Brauner <christian.brauner@mailbox.org>
Date: Fri, 8 Apr 2016 18:28:59 +0000 (+0200)
Subject: use lxc_read_nointr() and lxc_write_nointr()
X-Git-Tag: lxc-2.1.0~458^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e6580ec3a22edccf9a211dcac40767727009ef1;p=thirdparty%2Flxc.git

use lxc_read_nointr() and lxc_write_nointr()

Using EPOLLHUP to determine when to exit the loop is unreliable. Let's exit
clean when read() returns -1 && errno != EINTR or 0.

Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
---

diff --git a/src/lxc/console.c b/src/lxc/console.c
index f8741728b..a8d09cad8 100644
--- a/src/lxc/console.c
+++ b/src/lxc/console.c
@@ -161,33 +161,25 @@ static int lxc_console_cb_con(int fd, uint32_t events, void *data,
 {
 	struct lxc_console *console = (struct lxc_console *)data;
 	char buf[1024];
-	int r,w;
-
-	if (events & EPOLLHUP)
-		return 1;
-
-	w = r = read(fd, buf, sizeof(buf));
-	if (r < 0) {
-		SYSERROR("failed to read");
-		return 1;
-	}
+	int r, w;
 
-	if (!r) {
+	w = r = lxc_read_nointr(fd, buf, sizeof(buf));
+	if (r <= 0) {
 		INFO("console client on fd %d has exited", fd);
 		lxc_mainloop_del_handler(descr, fd);
 		close(fd);
-		return 0;
+		return 1;
 	}
 
 	if (fd == console->peer)
-		w = write(console->master, buf, r);
+		w = lxc_write_nointr(console->master, buf, r);
 
 	if (fd == console->master) {
 		if (console->log_fd >= 0)
-			w = write(console->log_fd, buf, r);
+			w = lxc_write_nointr(console->log_fd, buf, r);
 
 		if (console->peer >= 0)
-			w = write(console->peer, buf, r);
+			w = lxc_write_nointr(console->peer, buf, r);
 	}
 
 	if (w != r)
diff --git a/src/lxc/lxc_attach.c b/src/lxc/lxc_attach.c
index f02ef2621..ed3ba0df0 100644
--- a/src/lxc/lxc_attach.c
+++ b/src/lxc/lxc_attach.c
@@ -301,8 +301,10 @@ static int get_pty_on_host(struct lxc_container *c, struct wrapargs *wrap, int *
 		goto err2;
 	}
 
-	if (lxc_console_mainloop_add(&descr, conf) < 0)
+	if (lxc_console_mainloop_add(&descr, conf) < 0) {
+		ERROR("Failed to add handlers to lxc mainloop.");
 		goto err3;
+	}
 
 	ret = lxc_mainloop(&descr, -1);
 	if (ret) {