Skip to content

Commit

Permalink
attach: don't return early when calculating namespaces via pidfd
Browse files Browse the repository at this point in the history
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
  • Loading branch information
Christian Brauner committed Apr 12, 2021
1 parent c0f1dc9 commit 0c16794
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions src/lxc/attach.c
Expand Up @@ -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);
Expand All @@ -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",
Expand Down

0 comments on commit 0c16794

Please sign in to comment.