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 C1035803BB for ; Mon, 16 Nov 2026 16:07:24 +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 6AGG6BZ3027963; Mon, 16 Nov 2026 19:06:12 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGG6BZ3027963 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="QYijpuWl" Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AGG6AY5027939 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 16 Nov 2026 19:06:10 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGG6AY5027939 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-49d70f45b22so1272881f8f.2 for ; Mon, 16 Nov 2026 08:06:10 -0800 (PST) X-Forwarded-Encrypted: i=2; AL+hErF0z3ILHRBhZ60chWlNMgxiK5S2hnfHobasc7XnP8x2ozhKIJkt9+wZZRX9duJn4nK8jUKkvQ==@openvz.org X-Gm-Message-State: APuU4Z+vIwjppGAGC+86AhjWrnlWa6Z3/RTXX91sUhmfo0QO5Her0Rmm pcCi4V8Q0BHHtrw+5RzryfqI8svM0imD9Xjy83NQmeqimmLDWRNvFdpWO4We2qL1j5eQrrDGBKm kstkD1nV58jYhfHYHXOzzb0eGUdnxVo2V3s0z+0+MYKKKeoKUkP2UWg== X-Gm-Gg: AZFdTZdDoE/gPu+QmsawLRnQWlREfPfmKGZJphYsD2JUUxAZu4Z+9+G6ZpgooRna39B CAVtNFXHP8iknPol8qUQRfFVAY8DvfpYHknE5Ixg3WfEBonEMgfNSR018QUWIQB4Dhn1V7irAHh R4E6jwbrN3vaaMhNtf7qIes3qFgAdlUCrc9SU+u2hzQTp7KsoUa03jT4hviWExeAlKuJN9jTb5a ZmhejoBaK+6BqcZJDLetDtbpbMFCbAr75n6B049GRWK8aET6k7hupvyxQssEiupYL8upniGAf8D f9XrtFn+HyVCOdnr9HUNLpzG4Xd0BAV858CB4Dd8Evg97sNPTkuisqOc6QpDuLYFss0JTJuQXKE 9FPdULQEAFL797+jodq4MbfOwYDmc3Q== X-Received: by 2002:a05:6000:188c:b0:48c:4442:54e with SMTP id ffacd0b85a97d-49c727d1bfdmr23851794f8f.30.1794845169674; Mon, 16 Nov 2026 08:06:09 -0800 (PST) X-Received: by 2002:a05:6000:188c:b0:48c:4442:54e with SMTP id ffacd0b85a97d-49c727d1bfdmr23851715f8f.30.1794845169112; Mon, 16 Nov 2026 08:06:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794845169; cv=none; d=google.com; s=arc-20260327; b=qBG6GGt6cYOKH8cXcX4Qccx2JTshT2hG+nOng7lIXYquRGgF8P2pQclkkqcmYxMk2K VtYxen5ZBQxpZEnx0/NevA4eOm6DX04zvjRTbae/U86e808SLoq2jqNI1zVhU8ZFnobR fCjgmCLuetfYFYughy5iEtrAxeWEnqXHA1h2EJQaEuFDElRxIHcMrY2eeluO1n4L6vPz vv1kTMJHPffIv7HhrDW+7/wwaEKFz5ODk/6BuTkGl4H6okrhqRF2iG6FSzNyfnEvlE35 FZ3DfQhVHl74lJhaDQ773C0VT5Ya/1Yrm0WP4BMaUfn83qDTV78rzhZ4UsaGqyStrLUD wYjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:dkim-signature; bh=6zQZCgTfTefzVVoZMqPT8yiAGmF09S51IeOOpHhSni4=; fh=eCOFrBZAqsL6jjT8ApulcBPCLrgIlXlNCEpSn7Ap5O8=; b=L38pEAGZs4DwmnNW3sDTG5c0goCIsoLGKyObBliIKT47cmgrjs+fp00iqJNBC7RWwF nPLH+FTNRfVvl8F0rhQYQcQwZOyeAAODCkOrC+/jG/bWQbu7fPKj0Vrpa5OuEWcwYOAK QcY084ZbyjLmtYr6l+netGjuHxhA7jtQon1I1u+kn8s/saFXR65LW38OHlommfh8pXyg NDtIZaasr37Bfo1rLPPwenBKIsjQHriq3YIvXAApO//szSKncOTml5M/m+cTqpM/AFA2 wYAbIM5RfCsjDt/zMOJW8dhGi7fRiKLrNBHf84VSEarbbvnbE5hG9A67Ixh5PpMGo0hC HPEw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=QYijpuWl; spf=pass (google.com: domain of vladimir.riabchun@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=vladimir.riabchun@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-49c631220a8si22325963f8f.128.2026.11.16.08.06.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2026 08:06:09 -0800 (PST) Received-SPF: pass (google.com: domain of vladimir.riabchun@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=QYijpuWl; spf=pass (google.com: domain of vladimir.riabchun@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=vladimir.riabchun@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=Message-Id:Content-Type:MIME-Version:Subject:Date :From; bh=6zQZCgTfTefzVVoZMqPT8yiAGmF09S51IeOOpHhSni4=; b=QYijpuWlyDgdYr6KwAF xdRxp0HW0jiMyQlDoZfpopySK2Vy25H7cNO84BVmD8e0BAAYyA6Dl5c+H/V9N4R/N18CiVW9CYypD snH36MutTUuuDmmelQGX2U1r2tRMKh1Ww7h93NGwSsAztLeKiDrTLAVZPnYvkFBCPYM2xpG0j8ed8 /YzEWhgGoBU6NUF8s4ucmMbasFGPyqAmw/q32iGZRdS/lajK6qcmvDzcwPkwpDDk0YtxwHAnu11/5 8uU1yWShFAPdNkam8hzNFqtm8TTh73FaYDP2Xsd542Wrfftn39/Mc7DUUtuMwcDckhFdqygr4rrCZ vMs9hjGsAmyI1qg==; Received: from ch-demo-asa.virtuozzo.com ([130.117.225.8] helo=192.168.1.87) by relay.virtuozzo.com with esmtps (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1xSz9N-006Mia-28; Mon, 16 Nov 2026 17:06:00 +0100 From: Vladimir Riabchun Date: Mon, 16 Nov 2026 17:06:02 +0100 MIME-Version: 1.0 Message-Id: <20261116-ovl-use-orig-ve-v6-2-7cfb41c8c973@virtuozzo.com> References: <20261116-ovl-use-orig-ve-v6-0-7cfb41c8c973@virtuozzo.com> In-Reply-To: <20261116-ovl-use-orig-ve-v6-0-7cfb41c8c973@virtuozzo.com> To: vasileios.almpanis@virtuozzo.com, ptikhomirov@virtuozzo.com, Konstantin Khorenko X-Mailer: b4 0.16.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v6 2/5] ve: Introduce override_ve/revert_ve helpers 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 These helpers mirror override_creds/revert_creds and are supposed to be used together in cases when VE creds may be stored and later used by the different VE task. To keep task_ve consistent for other users, introduce a separate task->overrided_ve field. Nobody should race on it since its updates are supposed to go with override_creds, and non-current processes shouldn't do this. This field is not supposed to be inherited via fork, so a check for non-NULL overrided_ve was added in fork path. https://virtuozzo.atlassian.net/browse/VSTOR-142405 Signed-off-by: Vladimir Riabchun --- include/linux/sched.h | 1 + include/linux/ve.h | 31 +++++++++++++++++++++++++++++++ kernel/capability.c | 6 ++++-- kernel/fork.c | 2 ++ 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index 10545e470d3d..7f4e6b1fde38 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1065,6 +1065,7 @@ struct task_struct { #ifdef CONFIG_VE struct ve_struct *task_ve; struct ve_namespace *ve_ns; + struct ve_struct *overrided_ve; /* NULL when no overrides */ #endif #ifdef CONFIG_PREEMPT_RT struct netdev_xmit net_xmit; diff --git a/include/linux/ve.h b/include/linux/ve.h index 717567775f58..f5260bf25c00 100644 --- a/include/linux/ve.h +++ b/include/linux/ve.h @@ -295,6 +295,30 @@ static inline struct vdso_image *ve_get_vdso_64(struct ve_struct *ve) return ve->vdso_64; } +static inline struct ve_struct *override_ve(struct ve_struct *new_ve) +{ + struct ve_struct *old_ve = current->overrided_ve; + + /* CT tasks are not supposed to switch VE context, this is a breach */ + if (new_ve != get_exec_env() && !ve_is_super(get_exec_env())) { + pr_err_ratelimited("Invalid VE override: %s -> %s\n", + ve_name(get_exec_env()), + VE_IS_RUNNING(new_ve) ? ve_name(new_ve) : "(dead VE)"); + return ERR_PTR(-EPERM); + } + + current->overrided_ve = new_ve; + return old_ve; +} + +static inline void revert_ve(struct ve_struct *orig_ve) +{ + /* Somebody forgot to check override_ve return value? */ + if (WARN_ON_ONCE(IS_ERR(orig_ve))) + return; + current->overrided_ve = orig_ve; +} + #else /* CONFIG_VE */ #include #include @@ -405,6 +429,13 @@ static inline struct vdso_image *ve_get_vdso_64(struct ve_struct *ve) } #endif /* CONFIG_X86 */ +static inline struct ve_struct *override_ve(struct ve_struct *new_ve) +{ + return NULL; +} + +static inline void revert_ve(struct ve_struct *orig_ve) {} + #endif /* CONFIG_VE */ struct seq_file; diff --git a/kernel/capability.c b/kernel/capability.c index 34716847c6b8..6de4dcba2283 100644 --- a/kernel/capability.c +++ b/kernel/capability.c @@ -389,10 +389,11 @@ EXPORT_SYMBOL(ns_capable); bool ve_capable(int cap) { struct cred *cred; + struct ve_struct *ve = current->overrided_ve ?: get_exec_env(); bool ret; rcu_read_lock(); - cred = get_exec_env()->init_cred; + cred = ve->init_cred; if (cred == NULL) /* ve isn't running */ cred = ve0.init_cred; @@ -406,10 +407,11 @@ bool ve_capable(int cap) bool ve_capable_noaudit(int cap) { struct cred *cred; + struct ve_struct *ve = current->overrided_ve ?: get_exec_env(); bool ret; rcu_read_lock(); - cred = get_exec_env()->init_cred; + cred = ve->init_cred; if (cred == NULL) /* ve isn't running */ cred = ve0.init_cred; diff --git a/kernel/fork.c b/kernel/fork.c index 25e87cdbeb07..0b4c4554bf80 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1161,6 +1161,8 @@ static struct task_struct *dup_task_struct(struct task_struct *orig, int node) #ifdef CONFIG_VE memset(tsk->alloc_lat, 0, sizeof(tsk->alloc_lat)); + WARN_ON_ONCE(orig->overrided_ve); + tsk->overrided_ve = NULL; #endif /* -- 2.52.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel