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 96873803F6 for ; Tue, 10 Nov 2026 17:28:29 +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 6AAHRH4H017479; Tue, 10 Nov 2026 20:27:18 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AAHRH4H017479 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="QggkimAB" 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 6AAHR8vl017446 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Tue, 10 Nov 2026 20:27:08 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AAHR8vl017446 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-49205554e17so1524517f8f.1 for ; Tue, 10 Nov 2026 09:27:08 -0800 (PST) X-Forwarded-Encrypted: i=2; AL+hErF+jKXM6BLsfPaKUcp2IFBm3lHgJLU3miiP/GqDdjUaTOlmivG+98VxsNwthphJ6D1CHNBiGA==@openvz.org X-Gm-Message-State: APuU4Z+mLqhcgwPF6OKCg8jo1q/C57Nts0GmQh0QeXtDTZhsqGw/sAl8 iCwQUS8tMuuq8Ytj/P9boa5AbzHN4G/u9eO3cYlMScpk94XZBxxGl2qq0ARHPiX4LVx9adz+93p DoezxksxaPWujde6j7ocJnmcJnsMnbDuesCdqKDUQ3CfUrSsX4rWaQQ== X-Gm-Gg: AYBFou1vf2FcNrq5I5/+YtNvsfLjagGcTkLyEsp83ToAhNR/ClKAayPCFOM64Bl/A8G spuzIfrt1q1OidMaNCEZDaDc3Vt6qGp/HMXtZTYGFpx5UYawSP3w370p9rWIuO2vq29PvYU3LLC HICQcwk5ilp8A57r5d8R/20E+FDbd+D5cZoXIdufXwHiX5diiPrkAai/UnLkEqW7ai3qQv2K1dw MvGx2kvr98r2YImpYZubvLjxYroTMjBDPLkhZidszDUSaHLgXOLjuZSmj+PT1XD3dWFFzH5i1YF 9FdJ6896798NsLX24gIdXKjMSz8/iM3eNCNTDNgquaJ8lFENBHm74dJBIzJawpKv2Oi8jPqHtHx 7JFwQiB79hKK3MiWyj9kWEKxWyMuE X-Received: by 2002:a05:6000:4709:b0:48d:e5c9:39a4 with SMTP id ffacd0b85a97d-498302fb5camr5848116f8f.33.1794331628224; Tue, 10 Nov 2026 09:27:08 -0800 (PST) X-Received: by 2002:a05:6000:4709:b0:48d:e5c9:39a4 with SMTP id ffacd0b85a97d-498302fb5camr5848075f8f.33.1794331627688; Tue, 10 Nov 2026 09:27:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794331627; cv=none; d=google.com; s=arc-20260327; b=RlL7HlmSAxH6LtRtqhTPrc7MrsNusn5zTYFce3EKLd7f6D1gGA+S+xUc7LnhgPUj5M hZx0Er81ZubP8+0mkn40F2mN55N/oF9j8mQ2SADlkJXkvzafuZ41H+piEHIXXm8Lk3/E gsSJwTz6bLcNUVRdLs+nUDdtIAJvWE7oJJA1sPXF1czWJQaPOS/kpksswoDxHMX6MlP7 2UpUd9DVJhAVhNDM7OEwa0fe1yRdBg6r0Cq3nQ7nqwfChZDagjxt6VGiljDDKX996Ai8 C1k3R8qmgNUgLnuBagMvKpIo405Q8WDZoBCjp8d2dM72MnopziMr4NPYobT7wyr8z5Xh jJew== 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=KUt6QnumQriuVj0Hfg1a028s0sZgW6ItLnHVSpR9PPI=; fh=eCOFrBZAqsL6jjT8ApulcBPCLrgIlXlNCEpSn7Ap5O8=; b=c60i+B2d2OSnAIw5oBLYolzPnpyIlte1NrzbF5EdquPtyIWaX3UFAbNGtbSg107DCx aDrLthN/E69Khg1Z/HGfL+aP1T+ZYrJ0EvzK74YCP+W6bDujHZ/ar5KJ5FUkwsQQjwt6 GvcVKZEICd5w310Q81DQ3HOYwQ2cuo+l7xwkzjliCmtpoDXwHyVNePCm0Mel9DGguwoR YqipnKCpqxnE3AtxPjLal7uOi4rhtCzpKk+BZJem8wNVoQ+BmBmpIms+GDg7rcIxbPOZ A09AZIwwzHqE3BXk9Zaixx6hxtFb7vz/lCmEtvUOTjxk6EKTG4q8eIVmVwWGfJ93EonS Ybpg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=QggkimAB; 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-49837eb7240si6103650f8f.442.2026.11.10.09.27.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2026 09:27:07 -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=QggkimAB; 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=KUt6QnumQriuVj0Hfg1a028s0sZgW6ItLnHVSpR9PPI=; b=QggkimABMxb/wi784hY nrbpP/tRehtYXqlmdWDAEtV76PNLLiU/higeUKVfgrCHjM1SElERSgCmI+OiXISFk7rrv405Iwkj/ WYgJTuZO1QSBPQcUXW4CMKRvSo4ysH/J9JQTBL8Bm85DWYXuIK7TgUW3/grGAZSM+hEA1luKlCONb Rgz2IMjyqs0/+BH5SMH6TCG01b2URR7XKZD/YUISW6AmQ6PQXkOCM+qfSOfj/0IPPxQDx79AHjt3N 0v0g/RG28JrBqtFYNUpS0/FCbzUo1FYCE/L2NY2U6yEcTPQLn4J99e491EA9Miox+NawEg8FTZcvp 1TN8DrdL60rQ5nw==; 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 1xQpYb-0022KJ-0n; Tue, 10 Nov 2026 18:26:57 +0100 From: Vladimir Riabchun Date: Tue, 10 Nov 2026 18:26:49 +0100 MIME-Version: 1.0 Message-Id: <20261110-ovl-use-orig-ve-v5-2-f3f2bdb29e23@virtuozzo.com> References: <20261110-ovl-use-orig-ve-v5-0-f3f2bdb29e23@virtuozzo.com> In-Reply-To: <20261110-ovl-use-orig-ve-v5-0-f3f2bdb29e23@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 v5 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 report a check for this was added as well. https://virtuozzo.atlassian.net/browse/VSTOR-142405 Signed-off-by: Vladimir Riabchun --- include/linux/sched.h | 1 + include/linux/ve.h | 35 +++++++++++++++++++++++++++++++++++ kernel/capability.c | 6 ++++-- kernel/fork.c | 2 ++ 4 files changed, 42 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..ec22c7c4e464 100644 --- a/include/linux/ve.h +++ b/include/linux/ve.h @@ -295,6 +295,34 @@ 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())) { + if (ve_is_super(new_ve)) { + /* Don't cry about it, this event we may allow. */ + return ERR_PTR(-EPERM); + } + pr_err_ratelimited("Invalid VE override: %s -> %s\n", + ve_name(get_exec_env()), + ve_name(new_ve)); + return ERR_PTR(-EINVAL); + } + + 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 +433,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..0cb8ccb2f4f3 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(orig->overrided_ve); + tsk->overrided_ve = NULL; #endif /* -- 2.52.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel