Skip to content

L
lxc
Unverified Commit a39fc34b by Christian Brauner
Options

conf: switch to fd_to_fd() when copying mountinfo

Closes: #3580. Link: https://bugzilla.kernel.org/show_bug.cgi?id=209971Suggested-by: 's avatarJoan Bruguera <joanbrugueram@gmail.com> Signed-off-by: 's avatarChristian Brauner <christian.brauner@ubuntu.com>
parent 26dffd82
Showing with 3 additions and 7 deletions
src/lxc/conf.c
...@@ -2980,9 +2980,9 @@ void turn_into_dependent_mounts(void) ...@@ -2980,9 +2980,9 @@ void turn_into_dependent_mounts(void)
__do_free char *line = NULL; __do_free char *line = NULL;
__do_fclose FILE *f = NULL; __do_fclose FILE *f = NULL;
__do_close int memfd = -EBADF, mntinfo_fd = -EBADF; __do_close int memfd = -EBADF, mntinfo_fd = -EBADF;
int ret;
ssize_t copied;
size_t len = 0; size_t len = 0;
ssize_t copied;
int ret;
mntinfo_fd = open("/proc/self/mountinfo", O_RDONLY | O_CLOEXEC); mntinfo_fd = open("/proc/self/mountinfo", O_RDONLY | O_CLOEXEC);
if (mntinfo_fd < 0) { if (mntinfo_fd < 0) {
...@@ -3006,12 +3006,8 @@ void turn_into_dependent_mounts(void) ...@@ -3006,12 +3006,8 @@ void turn_into_dependent_mounts(void)
} }
} }
again: copied = fd_to_fd(mntinfo_fd, memfd);
copied = lxc_sendfile_nointr(memfd, mntinfo_fd, NULL, LXC_SENDFILE_MAX);
if (copied < 0) { if (copied < 0) {
if (errno == EINTR)
goto again;
SYSERROR("Failed to copy \"/proc/self/mountinfo\""); SYSERROR("Failed to copy \"/proc/self/mountinfo\"");
return; return;
} }
......
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