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 86D6781835 for ; Mon, 16 Nov 2026 17:20:16 +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 6AGHJ6Q7029317; Mon, 16 Nov 2026 20:19:06 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGHJ6Q7029317 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="GouB5IdD" Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AGHIwDx029279 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 16 Nov 2026 20:18:58 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGHIwDx029279 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-4b0a307487aso17452995e9.1 for ; Mon, 16 Nov 2026 09:18:58 -0800 (PST) X-Forwarded-Encrypted: i=2; AL+hErGZ8GANjOHWJIHpVKmk1+zqaprO2JySC2KYVv1vpNO5zutAtamU7Kyxp0iUrv2+9EZOV+jeAg==@openvz.org X-Gm-Message-State: APuU4Z8VaMLgrIE2vbQKJy/VTjo6uoRWnAH9FvQu+8mDT010rphRCCYv zhtQFMsFIHgpKMREzWFEskh221i/ou67RvYuqZ/gGqRFBgzvw8uteoo/ggjw5xdevZIpwd+oVVt b/cEol35lcGuw21dJAcBx0GC6fQSiVxfpFAlBFj3oUk500Bl8Wv7RSQ== X-Gm-Gg: AYBFou1dXyOo8hinBWi9wKz4Mx/xSj0G9dJwbC4gLcIZmp5mBA64bCk7VfihpDTgAmD DSy8pqN+xJle6X/t1nAemYXSh+wXAcMQ6SOLZZJiAc/IsDS8siUVIlN7kH5/WgbKA9ItrXhdvSq 5A+FKsiNUZrojqbNMUEg1xebb8SR5NlHxIJ4UhHtxmoaoBzBBn0dQzcoIhCRVYjT5LSYBlZDjZX sscr5JK7vTR8Ghst+KSeVPpMfvAoDHpkVRXJqkX2WBCnWKFXJsil4xOPIB9pjKKdIxWyaCvqaXq FQr36YF7Pmwxrf5nXYvMgvkJ+TZwlARnR6oT6RzbObF7wVFBSNJ4UmAcF4+lLqISyIypjxeqp6r mvihCtJtrDlYX2524mectxHWzMICnxA== X-Received: by 2002:a05:600c:c84:b0:4a1:e57b:667c with SMTP id 5b1f17b1804b1-4bb55a68429mr252723275e9.26.1794849538004; Mon, 16 Nov 2026 09:18:58 -0800 (PST) X-Received: by 2002:a05:600c:c84:b0:4a1:e57b:667c with SMTP id 5b1f17b1804b1-4bb55a68429mr252722805e9.26.1794849537480; Mon, 16 Nov 2026 09:18:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794849537; cv=none; d=google.com; s=arc-20260327; b=lQI7ye7wJoiDWdlCQXCMNYQ4M3G/dMxC6JKX6aW9fGlx/awkuS8v0MTtt9/niKUSTL F9FcSydOCkDpzDJekMxCpwK/GuesFaXY9pkAk45Lt5yVSAFuhjOylaK3yOCdFqU6pnc8 43ukfJ/Ys/ZWqReW2BDK8atLV3I6voohDD1TU5LsdN73Wbo7P1L2pyV7QqH/7nk2aa8Z JI+ykXWBI2W4M9qcBBWMr5rZ7AaLOqntKbzSsYUTfxW1tjukeuaeJEK564XxzDT4UThC yGfA5RWDT40M7D5BH421gr5k1yLJpgozy6Mr655rJfy7D7avxbeG9dpPxG0wkUktk22y QdjQ== 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=+pXGAJmtcQkCyTRLJPDgxNhGONdxakGfmxtM9D7nXo4=; fh=eCOFrBZAqsL6jjT8ApulcBPCLrgIlXlNCEpSn7Ap5O8=; b=QQ1PP+f2uwUH03Qhjv5aPhq6ScmGtfSSOWsajIO7B/5PfqBENzIRQuyfnoxbg6qkjF nYuxbnO3divXMiRrLJ2s4c7ktdPpQ6//uuDOH+ba0vlEk2gVV5ld573QUo9p8+1FMm9f +C+2O0SG9zVoiik5fMK4JXlacVuY3b3+z1U77p5pVxBYU2n0iSdaKU+rfRnHPz8Lsxdl +Q/eteFTxvyOr0wOzkfVfcgY+V4P+ou0SpKeQrOfBy7D6qttMxX2hC4iA0c4CeYb+tsW t/STCRHJp1tUy/XnT4CZJrQGElQ6X0252hVioGqIo5gYX38ONr8bJw78SxC7DvOSAfeX PXeg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=GouB5IdD; 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-4a312322391si1117607f8f.337.2026.11.16.09.18.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2026 09:18:57 -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=GouB5IdD; 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=+pXGAJmtcQkCyTRLJPDgxNhGONdxakGfmxtM9D7nXo4=; b=GouB5IdDxsmtNm26CLB 7iq7ns+jK+zFrFC78LKfD9uADPTyvuvm7AHPYnDswVZ83vBoiVI5bEu6Z8YQ27a7MpE6tSKxJWKbG nKplo7w8uoZkemurFpEa4ac5wh58Q6L+pIlWntHb9FKmLExumSLKi8qG4PfmJFwkvnflLi0P2z2II Dna1yJQsmTGghENdgeeaQkpe5Twa4X/ezGT/+TZoPRx1PdxOISvh/0y7SboNZwuBXKjootnIOuyss Pix4BZLuKSmbmtzz7Eeua1jYLOpJ41WAI3gW0XU8OCOXTMx7dEOzRNpm8vkFDiZfZBFbL11u8ahRF fHi7898yjjlXF1Q==; 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 1xT0Hp-007kVE-37; Mon, 16 Nov 2026 18:18:48 +0100 From: Vladimir Riabchun Date: Mon, 16 Nov 2026 18:18:52 +0100 MIME-Version: 1.0 Message-Id: <20261116-ovl-use-orig-ve-v7-2-37daa56081ed@virtuozzo.com> References: <20261116-ovl-use-orig-ve-v7-0-37daa56081ed@virtuozzo.com> In-Reply-To: <20261116-ovl-use-orig-ve-v7-0-37daa56081ed@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 v7 2/6] 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. ve_capable and friends now use overrided_ve field if it is non-NULL. 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 | 30 ++++++++++++++++++++++++++++++ kernel/capability.c | 6 ++++-- kernel/fork.c | 2 ++ 4 files changed, 37 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..be1c828a5d1e 100644 --- a/include/linux/ve.h +++ b/include/linux/ve.h @@ -295,6 +295,29 @@ 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 for CT#%s task\n", + ve_name(get_exec_env())); + 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 +428,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