From: Maxim Levitsky <mlevitsk@redhat.com>
To: kvm@vger.kernel.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
"H. Peter Anvin" <hpa@zytor.com>, Shuah Khan <shuah@kernel.org>,
Yang Zhong <yang.zhong@intel.com>,
Wei Wang <wei.w.wang@intel.com>,
Colton Lewis <coltonlewis@google.com>,
Sean Christopherson <seanjc@google.com>,
Jim Mattson <jmattson@google.com>,
Chenyi Qiang <chenyi.qiang@intel.com>,
Borislav Petkov <bp@alien8.de>,
linux-kernel@vger.kernel.org, x86@kernel.org,
Thomas Gleixner <tglx@linutronix.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
Ingo Molnar <mingo@redhat.com>,
David Matlack <dmatlack@google.com>, Peter Xu <peterx@redhat.com>,
Maxim Levitsky <mlevitsk@redhat.com>,
linux-kselftest@vger.kernel.org, stable@vger.kernel.org
Subject: [PATCH 2/9] KVM: x86: nSVM: harden svm_free_nested against freeing vmcb02 while still in use
Date: Thu, 3 Nov 2022 15:57:29 +0200 [thread overview]
Message-ID: <20221103135736.42295-3-mlevitsk@redhat.com> (raw)
In-Reply-To: <20221103135736.42295-1-mlevitsk@redhat.com>
Make sure that KVM uses vmcb01 before freeing nested state, and warn if
that is not the case.
This is a minimal fix for CVE-2022-3344 making the kernel print a warning
instead of a kernel panic.
Cc: stable@vger.kernel.org
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
---
arch/x86/kvm/svm/nested.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c
index b258d6988f5dde..b74da40c1fc40c 100644
--- a/arch/x86/kvm/svm/nested.c
+++ b/arch/x86/kvm/svm/nested.c
@@ -1126,6 +1126,9 @@ void svm_free_nested(struct vcpu_svm *svm)
if (!svm->nested.initialized)
return;
+ if (WARN_ON_ONCE(svm->vmcb != svm->vmcb01.ptr))
+ svm_switch_vmcb(svm, &svm->vmcb01);
+
svm_vcpu_free_msrpm(svm->nested.msrpm);
svm->nested.msrpm = NULL;
--
2.34.3
next prev parent reply other threads:[~2022-11-03 13:59 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-03 13:57 [PATCH 0/9] nSVM: Security and correctness fixes Maxim Levitsky
2022-11-03 13:57 ` [PATCH 1/9] KVM: x86: nSVM: leave nested mode on vCPU free Maxim Levitsky
2022-11-03 13:57 ` Maxim Levitsky [this message]
2022-11-03 13:57 ` [PATCH 3/9] KVM: x86: add kvm_leave_nested Maxim Levitsky
2022-11-03 13:57 ` [PATCH 4/9] KVM: x86: forcibly leave nested mode on vCPU reset Maxim Levitsky
2022-11-03 13:57 ` [PATCH 5/9] KVM: selftests: move idt_entry to header Maxim Levitsky
2022-11-03 13:57 ` [PATCH 6/9] kvm: selftests: add svm nested shutdown test Maxim Levitsky
2022-11-03 13:57 ` [PATCH 7/9] KVM: x86: allow L1 to not intercept triple fault Maxim Levitsky
2022-11-03 13:57 ` [PATCH 8/9] KVM: selftests: add svm part to triple_fault_test Maxim Levitsky
2022-11-03 13:57 ` [PATCH 9/9] KVM: x86: remove exit_int_info warning in svm_handle_exit Maxim Levitsky
2022-11-03 14:06 ` [PATCH 0/9] nSVM: Security and correctness fixes Maxim Levitsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221103135736.42295-3-mlevitsk@redhat.com \
--to=mlevitsk@redhat.com \
--cc=bp@alien8.de \
--cc=chenyi.qiang@intel.com \
--cc=coltonlewis@google.com \
--cc=dave.hansen@linux.intel.com \
--cc=dmatlack@google.com \
--cc=hpa@zytor.com \
--cc=jmattson@google.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=seanjc@google.com \
--cc=shuah@kernel.org \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=wei.w.wang@intel.com \
--cc=x86@kernel.org \
--cc=yang.zhong@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox