mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-09-03 06:29:36 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3779 from brauner/2021-04-12/attach_fixes

Browse Source 
attach: fixes
This commit is contained in:
Stéphane Graber
2021-04-12 13:20:03 -04:00
committed by GitHub
parent d32dcd01e7 09a83db55b
commit aeff7df6e4
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/lxc/attach.c
View File

@@ -534,9 +534,6 @@ static int __prepare_namespaces_pidfd(struct attach_context *ctx)
for (int i = 0; i < LXC_NS_MAX; i++) {
int ret;
if (!(ctx->ns_inherited & ns_info[i].clone_flag))
continue;
ret = same_nsfd(ctx->dfd_self_pid,
ctx->dfd_init_pid,
ns_info[i].proc_path);
@@ -545,10 +542,11 @@ static int __prepare_namespaces_pidfd(struct attach_context *ctx)
__fallthrough;
case 1:
ctx->ns_inherited &= ~ns_info[i].clone_flag;
break;
TRACE("Shared %s namespace doesn't need attach", ns_info[i].proc_name);
continue;
case 0:
TRACE("Shared %s namespace needs attach", ns_info[i].proc_name);
break;
TRACE("Different %s namespace needs attach", ns_info[i].proc_name);
continue;
}
return syserror("Failed to determine whether %s namespace is shared",

3
src/lxc/rexec.c
View File

@@ -162,9 +162,6 @@ static void lxc_rexec_as_memfd(char **argv, char **envp, const char *memfd_name)
if (execfd < 0)
return;
ret = close_range(STDERR_FILENO + 1, MAX_FILENO, CLOSE_RANGE_CLOEXEC);
if (ret && (errno != ENOSYS && errno != EINVAL))
fprintf(stderr, "%m - Failed to mark all file descriptors as close-on-exec\n");
fexecve(execfd, argv, envp);
}