From patchwork Thu Apr 27 02:21:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cengiz Can X-Patchwork-Id: 1774320 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=WlcEUcOi; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q6KKT6JQkz23vL for ; Thu, 27 Apr 2023 12:23:25 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1prrHz-0006GM-G2; Thu, 27 Apr 2023 02:23:19 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1prrHy-0006GF-2l for kernel-team@lists.ubuntu.com; Thu, 27 Apr 2023 02:23:18 +0000 Received: from mail-oa1-f72.google.com (mail-oa1-f72.google.com [209.85.160.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 7F05542253 for ; Thu, 27 Apr 2023 02:23:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1682562197; bh=FfOYg6762Zf83UCIpXHkVJMk2AjzkgYCneRRV/KedJ8=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WlcEUcOioworbr7KMiBqm3G+TgRCfCQSehFl/KUD644YE2Xx7s0LUWlXMVw/eTX8P X4NII0Cl8byl8EKPY3r226bWFqfUCpRwsFhB/vy3Agjlct9Yx7fvuip9jfeZiKkUna lrWHZc4tUQlFxAi/35YyT68GrCXhBWvZy7XN/mRHJ2k61U65d167/wjbsc5e/3yQEl U32/MEaGDKYfQ41zaDzP5TU4Y6Eu/O1i9AaxXiE+ohy7dFJnirRYVkjqp/UdQHvVCr 9+52MMtHikGW91/JyW/CpU+ryAXK8dGFVEPQQcE66LbhzaEkF1xcztEZEb09vEi/hv HPGXKbw1t5vLg== Received: by mail-oa1-f72.google.com with SMTP id 586e51a60fabf-18f16a11821so1823310fac.0 for ; Wed, 26 Apr 2023 19:23:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682562196; x=1685154196; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FfOYg6762Zf83UCIpXHkVJMk2AjzkgYCneRRV/KedJ8=; b=EDeV0tH5QI0DuLUErsChztnLCovDCcEEvyfNYFCX2WxTiDi5ygyqdi259A6v5SgLN4 jV2I827D/mTAt6tBsynRKGhoaHvquqQ/XS/w8iwpM6maHKcnYjOTXgJA9vqr/iucq78X mGINf0FoGc2MootwVH2TyobUWaBT3JRtWBACjHVa2R3yHKRxGefXsk3mYsepfQz4Uz4n syuudrmiJi81SOfLhm0XMvD7kM5dUohtXvPmNzBKMoDS8/Jurcvcod/VKB65T09Yb9xA /mhjS7grx6SNINEqZXjkDe7f82DbynjCBir0cjQMW2WhCcsDTCLZKAILAl3RFbRj4E9P D8YQ== X-Gm-Message-State: AC+VfDygrfy3EXOoS8Xuccl2+xS3JSnXx4BzhzRKiD7O6dIYKdPsZCxF x8Bg9PZdY1TUiaOhMYcq7oiTRFmAP+VNZoWxpKNtlaxWnnTXiNZK6Fby+5cUrHh98o1yG5Eqmp8 dtkTKRGsFWA0YxVxCHD7KtzM7+N2yckVCi3i8RDMYgila7mUEWxv2D9U= X-Received: by 2002:a05:6870:80d1:b0:177:b939:9c48 with SMTP id r17-20020a05687080d100b00177b9399c48mr2030043oab.17.1682562196069; Wed, 26 Apr 2023 19:23:16 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7IdiYq8Z++FHXCLMvgrNSOlezMJ6DBsleI7HGN9doPyK9IlK+OM/iCQk3jmVHL5SivlrdzTg== X-Received: by 2002:a05:6870:80d1:b0:177:b939:9c48 with SMTP id r17-20020a05687080d100b00177b9399c48mr2030040oab.17.1682562195768; Wed, 26 Apr 2023 19:23:15 -0700 (PDT) Received: from localhost ([2001:67c:1560:8007::aac:c03c]) by smtp.gmail.com with ESMTPSA id h5-20020a9d6405000000b006a65be836acsm4186132otl.16.2023.04.26.19.23.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 19:23:15 -0700 (PDT) From: Cengiz Can To: kernel-team@lists.ubuntu.com Subject: [SRU Bionic 1/1] KVM: nVMX: add missing consistency checks for CR0 and CR4 Date: Thu, 27 Apr 2023 05:21:12 +0300 Message-Id: <20230427022110.544535-3-cengiz.can@canonical.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230427022110.544535-1-cengiz.can@canonical.com> References: <20230427022110.544535-1-cengiz.can@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Paolo Bonzini commit 112e66017bff7f2837030f34c2bc19501e9212d5 upstream. The effective values of the guest CR0 and CR4 registers may differ from those included in the VMCS12. In particular, disabling EPT forces CR4.PAE=1 and disabling unrestricted guest mode forces CR0.PG=CR0.PE=1. Therefore, checks on these bits cannot be delegated to the processor and must be performed by KVM. Reported-by: Reima ISHII Cc: stable@vger.kernel.org Signed-off-by: Paolo Bonzini [OP: drop CC() macro calls, as tracing is not implemented in 4.19] [OP: adjust "return -EINVAL" -> "return 1" to match current return logic] Signed-off-by: Ovidiu Panait Signed-off-by: Greg Kroah-Hartman CVE-2023-28464 (cherry picked from commit 495adb06518bb10f50e1aa1a1dbd5daa47d118f2 linux-4.19.y) Signed-off-by: Cengiz Can --- arch/x86/kvm/vmx.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 005295f63559..da1ed6d5c04d 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -11479,7 +11479,7 @@ static int check_vmentry_prereqs(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) static int check_vmentry_postreqs(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, u32 *exit_qual) { - bool ia32e; + bool ia32e = !!(vmcs12->vm_entry_controls & VM_ENTRY_IA32E_MODE); *exit_qual = ENTRY_FAIL_DEFAULT; @@ -11493,6 +11493,13 @@ static int check_vmentry_postreqs(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, return 1; } + if ((vmcs12->guest_cr0 & (X86_CR0_PG | X86_CR0_PE)) == X86_CR0_PG) + return 1; + + if ((ia32e && !(vmcs12->guest_cr4 & X86_CR4_PAE)) || + (ia32e && !(vmcs12->guest_cr0 & X86_CR0_PG))) + return 1; + /* * If the load IA32_EFER VM-entry control is 1, the following checks * are performed on the field for the IA32_EFER MSR: @@ -11504,7 +11511,6 @@ static int check_vmentry_postreqs(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, */ if (to_vmx(vcpu)->nested.nested_run_pending && (vmcs12->vm_entry_controls & VM_ENTRY_LOAD_IA32_EFER)) { - ia32e = (vmcs12->vm_entry_controls & VM_ENTRY_IA32E_MODE) != 0; if (!kvm_valid_efer(vcpu, vmcs12->guest_ia32_efer) || ia32e != !!(vmcs12->guest_ia32_efer & EFER_LMA) || ((vmcs12->guest_cr0 & X86_CR0_PG) &&