tree-wide: handle EINTR in some read()/write()

parent d309c5d1
...@@ -2332,11 +2332,11 @@ FILE *make_anonymous_mount_file(struct lxc_list *mount) ...@@ -2332,11 +2332,11 @@ FILE *make_anonymous_mount_file(struct lxc_list *mount)
mount_entry = iterator->elem; mount_entry = iterator->elem;
len = strlen(mount_entry); len = strlen(mount_entry);
ret = write(fd, mount_entry, len); ret = lxc_write_nointr(fd, mount_entry, len);
if (ret != len) if (ret != len)
goto on_error; goto on_error;
ret = write(fd, "\n", 1); ret = lxc_write_nointr(fd, "\n", 1);
if (ret != 1) if (ret != 1)
goto on_error; goto on_error;
} }
...@@ -3951,7 +3951,7 @@ static int run_userns_fn(void *data) ...@@ -3951,7 +3951,7 @@ static int run_userns_fn(void *data)
/* Wait for parent to finish establishing a new mapping in the user /* Wait for parent to finish establishing a new mapping in the user
* namespace we are executing in. * namespace we are executing in.
*/ */
if (read(d->p[0], &c, 1) != 1) if (lxc_read_nointr(d->p[0], &c, 1) != 1)
return -1; return -1;
/* Close read end of the pipe. */ /* Close read end of the pipe. */
...@@ -4224,7 +4224,7 @@ int userns_exec_1(struct lxc_conf *conf, int (*fn)(void *), void *data, ...@@ -4224,7 +4224,7 @@ int userns_exec_1(struct lxc_conf *conf, int (*fn)(void *), void *data,
} }
/* Tell child to proceed. */ /* Tell child to proceed. */
if (write(p[1], &c, 1) != 1) { if (lxc_write_nointr(p[1], &c, 1) != 1) {
SYSERROR("Failed telling child process \"%d\" to proceed", pid); SYSERROR("Failed telling child process \"%d\" to proceed", pid);
goto on_error; goto on_error;
} }
...@@ -4401,7 +4401,7 @@ int userns_exec_full(struct lxc_conf *conf, int (*fn)(void *), void *data, ...@@ -4401,7 +4401,7 @@ int userns_exec_full(struct lxc_conf *conf, int (*fn)(void *), void *data,
} }
/* Tell child to proceed. */ /* Tell child to proceed. */
if (write(p[1], &c, 1) != 1) { if (lxc_write_nointr(p[1], &c, 1) != 1) {
SYSERROR("Failed telling child process \"%d\" to proceed", pid); SYSERROR("Failed telling child process \"%d\" to proceed", pid);
goto on_error; goto on_error;
} }
......
...@@ -340,7 +340,7 @@ static int signal_handler(int fd, uint32_t events, void *data, ...@@ -340,7 +340,7 @@ static int signal_handler(int fd, uint32_t events, void *data,
struct signalfd_siginfo siginfo; struct signalfd_siginfo siginfo;
struct lxc_handler *hdlr = data; struct lxc_handler *hdlr = data;
ret = read(fd, &siginfo, sizeof(siginfo)); ret = lxc_read_nointr(fd, &siginfo, sizeof(siginfo));
if (ret < 0) { if (ret < 0) {
ERROR("Failed to read signal info from signal file descriptor %d", fd); ERROR("Failed to read signal info from signal file descriptor %d", fd);
return LXC_MAINLOOP_ERROR; return LXC_MAINLOOP_ERROR;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment