From 0b8e876fbda6d7198b483ac7a96169e78f97e519 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Mon, 12 Apr 2021 17:23:24 +0200 Subject: [PATCH] attach: don't return early when calculating namespaces via pidfd Signed-off-by: Christian Brauner --- src/lxc/attach.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/lxc/attach.c b/src/lxc/attach.c index 24590cf21..04c8efc60 100644 --- a/src/lxc/attach.c +++ b/src/lxc/attach.c @@ -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", -- 2.47.2