From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (mail.openvz.org [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id 602A9803BB for ; Tue, 17 Nov 2026 10:15:19 +0000 (UTC) Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AHAE2tp007935; Tue, 17 Nov 2026 13:14:03 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AHAE2tp007935 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="tLAmJJDP" Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AHADaCs007886 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Tue, 17 Nov 2026 13:13:37 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AHADaCs007886 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-4a4191ae436so599757f8f.2 for ; Tue, 17 Nov 2026 02:13:37 -0800 (PST) X-Gm-Message-State: APuU4Z/d4s0m8DCMTZ6Xe05hwI7IrEji9zE8D8YYkaf79HeSnBu2KoMs cFED5w3JEwQ8Bl3/bK1qIZhV8ly6tBfpLKr8RBxlzt0gn78k/+/DjRPV8JEAA8OWjLQgSG4ISIi SGIl3WVZZXvyvJCdjSiOqTDeCQR8EM+C+Bu9RvwWDa8uJBKRK6xUITQ== X-Gm-Gg: AZFdTZcmdlloTQ39sjW2shrqHAhvqnM45uyEuPMIbYyR02Dji8R+YoskMc1TfCw9VYd csnfgy03YuLxrdofbTs4W2ry/kvix9S5norEp8ATWco0EKrJhiV/PVqX8TcUoMd68A706u4uUkC 9diKDSW+ggJ1eC1KYD8DJeabTHUPIClea0oWxZbM8hTrlgWi0p9DLRMH6HGF8d5NgZIbN/GGP8/ I9dmi+MC+YUiX0f5aaOi9P7WzYQzt6JugZHTyfudPDjjv3cfwh83tfLs3s29+aatkWkkfbkoqZn JVrcoHGSwrsLdOHKLaWC9w1uj57yYrlfQmUy+v7UpxwtrLmOHTKwoQjckqJMn04lHbEhO5ztnVn GR3Aq8u3eDvT2IQNf0cwIyec0ZGsoQA== X-Received: by 2002:a05:6000:2084:b0:498:be72:6371 with SMTP id ffacd0b85a97d-49c713aa624mr29889689f8f.21.1794910415960; Tue, 17 Nov 2026 02:13:35 -0800 (PST) X-Received: by 2002:a05:6000:2084:b0:498:be72:6371 with SMTP id ffacd0b85a97d-49c713aa624mr29889625f8f.21.1794910415427; Tue, 17 Nov 2026 02:13:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794910415; cv=none; d=google.com; s=arc-20260327; b=jp9fLdR5GoZeRetNhs+pDYHyxEvkHK1gq/HTDJ56J8GuK+/E89NO8w1hvF9ydV2kfS vIGPh/iYlTZyAf+p4jNtTOokHdRymreQxuwseL5Z0evvrWIVkXsCitQtHk2qDMzry2Bg eIyjpnUqLPvIbuJ9GOKsOjARO7Usbm0SmSJ+aDe1rlv9Rr2BA7fJvIa8xK/HRywydxNu swt7bpM+va/UYcgOhNQrTCOOCMTUl4GA8XholNWWg1JZ4eqREhidkyYFBqSKw35PC6QL eqkDykM1hycgj9X/EfgxvjQdJxum1oTbkfGIeXd+Q3p3tnl3OZFIi0kTgcyBvF7GPHfG qXnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=wigLnKNIYg0yGIBhmrOm+VLA/VVRDw9+5zFeOHFd5rM=; fh=wpoNUURlquLpJK/14Kny0oMIYkY7mYwjJ/Ils9UT2kk=; b=FH1V5gpr4LEFV3MEDldXDpdKAe4zesKcjY/erko5H5Y4ffGpTwAB4VNW6pEkgxE2St J/JsWBY1lRNNH7fVCuXszc2QH/3zT3e5qzD0g3TscMlRsPSZIIVJdlBaIn5zENwQzH+Y zzgUSU6crRaSZb1Mnt3eW2nOLUzNKIMogeyQMtISy+y30wHSooR7oznu6/L3N8UEMi+c 7HZUy3U2TXQOgR8TcSxGxbZuOxWMMP+HyZxa22lcLG1ZPF8RDDSQgbNavSHFC0yyEyPl MqAFcEfJd7VQk1dS9XRjObkwVsDIkWoRMtQqvyWfhoVXg69y0OuxTR2CBLDdlREhwNtX U2MQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=tLAmJJDP; spf=pass (google.com: domain of mirian.shilakadze@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=mirian.shilakadze@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from relay.virtuozzo.com (relay.virtuozzo.com. [130.117.225.111]) by mx.google.com with ESMTPS id ffacd0b85a97d-4a570b4a99csi119565f8f.125.2026.11.17.02.13.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2026 02:13:35 -0800 (PST) Received-SPF: pass (google.com: domain of mirian.shilakadze@virtuozzo.com designates 130.117.225.111 as permitted sender) client-ip=130.117.225.111; Authentication-Results: mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=tLAmJJDP; spf=pass (google.com: domain of mirian.shilakadze@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=mirian.shilakadze@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-ID:Date:Subject:From: Content-Type; bh=wigLnKNIYg0yGIBhmrOm+VLA/VVRDw9+5zFeOHFd5rM=; b=tLAmJJDP9JZr fz6VOaJTX6zpsZeVmiJSSKiHhygz2b0KUX9Y7R+KTw4NgcFBIVaEMQHlFAy+9rQf/2RCyyMesfFHX 21nGRf0zvjFRSvk/oUT4rE0NdX1DJedHVDZbICghLkgaMlek7ODRBXuxS+bWWaEvPSoQ+899zCR5J Pjl2DjHzTCrZG44mMASbonHCJ09vIS4tTmuA0odDOjFHCvuSXc2TkfzAXvsJkWca0QoAlqG7TXgEm 4/Fl6+W6c2LG08icmjVOhXa5QUjD8KGEiNFKVJImzZe3Dm8MNDDXeKMLJNH9xcP8pwv3mndPq/7OG jfCaptzBHHJTyy+1hXuzwg==; Received: from ch-demo-asa.virtuozzo.com ([130.117.225.8] helo=localhost.localdomain) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1xTG7i-009MQ7-2F; Tue, 17 Nov 2026 11:13:25 +0100 From: Mirian Shilakadze To: khorenko@virtuozzo.com, ptikhomirov@virtuozzo.com Date: Tue, 17 Nov 2026 14:13:23 +0400 Message-ID: <20261117101329.225854-4-mirian.shilakadze@virtuozzo.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261117101329.225854-1-mirian.shilakadze@virtuozzo.com> References: <20261117101329.225854-1-mirian.shilakadze@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.2 v2 3/6] ve: hide the tasks that set up a starting VE from the rest of it X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org CRIU's restoring tasks enter the VE before it runs, so they stay VD_PTRACE_COREDUMP. A container binary run during the restore, such as the tee that post-restore runs via vzctl exec3, can open their /proc//fd and take CRIU's log, its /proc fd and the transport socket. Mark a task the host sends into a starting VE as VD_VE_SETUP_TASK. Fork keeps the mark and exec drops it. While the VE is pseudosuper, such a task dumps no core and is reachable only from another setup task of the VE, so CRIU's tasks still reach each other and what they exec does not. Once pseudosuper is cleared the mark counts as VD_PTRACE_COREDUMP, so the restored processes become ordinary ones. Of the tasks leaving a pseudosuper VE, only its setup tasks are marked in the VE they enter, so a host task that moves on to a running VE stays hidden there. Feature: trace: prohibit tracing sensitive tasks from CT https://virtuozzo.atlassian.net/browse/VSTOR-151265 Signed-off-by: Mirian Shilakadze --- fs/coredump.c | 2 +- include/linux/mm_types.h | 3 ++ include/linux/ve.h | 4 +++ kernel/ptrace.c | 23 ++++++++++++--- kernel/ve/ve.c | 60 +++++++++++++++++++++++++++++++++++----- 5 files changed, 80 insertions(+), 12 deletions(-) diff --git a/fs/coredump.c b/fs/coredump.c index 3d15612e3493..6977c31aad59 100644 --- a/fs/coredump.c +++ b/fs/coredump.c @@ -618,7 +618,7 @@ void do_coredump(const kernel_siginfo_t *siginfo) goto fail; /* Avoid dumping sensitive tasks */ - if (mm->vps_dumpable != VD_PTRACE_COREDUMP) + if (ve_vps_dumpable(mm, get_exec_env()) != VD_PTRACE_COREDUMP) goto fail; cred = prepare_creds(); if (!cred) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index befdf38ef855..53cb5ff32a23 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -1115,6 +1115,9 @@ extern struct mm_struct init_mm; #define VD_PTRACE_COREDUMP 1/* tasks with ptrace and coredump allowed */ #define VD_LICDATA_ACCESS 2/* tasks accessed containers license data, * no ptrace and no coredump allowed */ +#define VD_VE_SETUP_TASK 3/* tasks the host sent into a starting VE, + * reachable only from each other while it + * is pseudosuper, VD_PTRACE_COREDUMP after */ /* Pointer magic because the dynamic array size confuses some compilers. */ static inline void mm_init_cpumask(struct mm_struct *mm) diff --git a/include/linux/ve.h b/include/linux/ve.h index 2fe1a1c9ff55..56c310205394 100644 --- a/include/linux/ve.h +++ b/include/linux/ve.h @@ -284,6 +284,8 @@ extern bool is_ve_init_net(const struct net *net); void ve_setup_task(struct task_struct *p, struct ve_struct *old_ve, struct ve_struct *ve); +bool ve_current_is_pseudosuper(struct ve_struct *ve); +int ve_vps_dumpable(struct mm_struct *mm, struct ve_struct *ve); void ve_set_rpc_kill_fn(void (*fn)(struct net *, bool)); @@ -393,6 +395,8 @@ static inline int vz_security_protocol_check(struct net *net, int protocol) { re static inline void ve_setup_task(struct task_struct *p, struct ve_struct *old_ve, struct ve_struct *ve) { } +static inline bool ve_current_is_pseudosuper(struct ve_struct *ve) { return true; } +#define ve_vps_dumpable(mm, ve) ((mm)->vps_dumpable) static inline void ve_set_rpc_kill_fn(void (*fn)(struct net *, bool)) { } diff --git a/kernel/ptrace.c b/kernel/ptrace.c index faf60bb8ae2c..ff71c3e37bc1 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -284,11 +284,26 @@ static bool task_still_dumpable(struct task_struct *task, unsigned int mode) * whose mm was already dropped in exit_mm() or a kernel thread - cannot * have its vps_dumpable confirmed, so deny it. This closes the window * where a dying CT task could be inspected (e.g. an fd stolen via - * pidfd_getfd()) after exit_mm() cleared ->mm. + * pidfd_getfd()) after exit_mm() cleared ->mm. While its VE is + * pseudosuper, a setup task is only inspectable by another one. */ - if (!ve_is_super(get_exec_env()) && - (!mm || mm->vps_dumpable != VD_PTRACE_COREDUMP)) - return false; + if (!ve_is_super(get_exec_env())) { + struct ve_struct *ve = task_ve(task); + + if (!mm) + return false; + + switch (ve_vps_dumpable(mm, ve)) { + case VD_PTRACE_COREDUMP: + break; + case VD_VE_SETUP_TASK: + if (!ve_current_is_pseudosuper(ve)) + return false; + break; + default: + return false; + } + } if (mm) { if (get_dumpable(mm) == SUID_DUMP_USER) diff --git a/kernel/ve/ve.c b/kernel/ve/ve.c index ff1c7f9b88c7..1cf4e71e8779 100644 --- a/kernel/ve/ve.c +++ b/kernel/ve/ve.c @@ -1778,6 +1778,49 @@ bool ve_check_trusted_exec(struct file *file, struct filename *name) return false; } +/** + * ve_current_has_mark - is current a task of pseudosuper @ve with @mark + * @ve: the VE + * @mark: the vps_dumpable value + */ +static bool ve_current_has_mark(struct ve_struct *ve, unsigned int mark) +{ + struct mm_struct *mm = current->mm; + + return ve->is_pseudosuper && task_ve(current) == ve && + mm && mm->vps_dumpable == mark; +} + +/** + * ve_current_is_pseudosuper - may current use the pseudosuper relaxations of @ve + * @ve: the VE that grants them + * + * Always true for ve0. Otherwise only a VD_VE_SETUP_TASK of @ve may, and only + * until pseudosuper is cleared. Exec clears VD_VE_SETUP_TASK, so the container + * binaries that the host tools run may not. + */ +bool ve_current_is_pseudosuper(struct ve_struct *ve) +{ + return ve_is_super(ve) || ve_current_has_mark(ve, VD_VE_SETUP_TASK); +} + +/** + * ve_vps_dumpable - vps_dumpable of a task as the access checks see it + * @mm: the task's mm + * @ve: the task's VE + * + * A setup task becomes an ordinary one once @ve leaves pseudosuper, which + * cannot be set again while @ve runs. ve0 never leaves it. + */ +int ve_vps_dumpable(struct mm_struct *mm, struct ve_struct *ve) +{ + if (mm->vps_dumpable == VD_VE_SETUP_TASK && + (ve_is_super(ve) || !ve->is_pseudosuper)) + return VD_PTRACE_COREDUMP; + + return mm->vps_dumpable; +} + #ifdef CONFIG_CGROUP_SCHED int ve_show_cpu_stat(struct ve_struct *ve, struct seq_file *p) { @@ -1838,14 +1881,17 @@ void ve_setup_task(struct task_struct *task, struct ve_struct *old_ve, return; /* - * A task the host sends into a started VE is hidden from the tasks of - * the VE. The mark goes to the mm, which may be shared, so a task - * coming from a container never gets it, unless the container is - * pseudosuper: the host's tasks there cannot be told from its own. + * A task the host sends into a starting VE is a setup task, one it + * sends into a started VE is hidden from the tasks of the VE. A setup + * task leaving a VE that is still pseudosuper was sent by the host + * too. The mark goes to the mm, which may be shared, so a task coming + * from a container never gets either. */ - if (task->mm && old_ve != ve && ve->state != VE_STATE_STARTING && - (ve_is_super(old_ve) || old_ve->is_pseudosuper)) - task->mm->vps_dumpable = VD_VE_ENTER_TASK; + if (task->mm && old_ve != ve && + (ve_is_super(old_ve) || + ve_vps_dumpable(task->mm, old_ve) == VD_VE_SETUP_TASK)) + task->mm->vps_dumpable = ve->state == VE_STATE_STARTING ? + VD_VE_SETUP_TASK : VD_VE_ENTER_TASK; /* Drop OOM protection. */ task->signal->oom_score_adj = 0; -- 2.43.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel