x86/kvm: Do not try to disable kvmclock if it was not enabled
mainline inclusion from mainline-v6.8-rc1 commit 1c6d984f523f67ecfad1083bb04c55d91977bb15 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I990A4 CVE: CVE-2021-47110 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1c6d984f523f67ecfad1083bb04c55d91977bb15 ------------------------------------------------------ kvm_guest_cpu_offline() tries to disable kvmclock regardless if it is present in the VM. It leads to write to a MSR that doesn't exist on some configurations, namely in TDX guest: unchecked MSR access error: WRMSR to 0x12 (tried to write 0x0000000000000000) at rIP: 0xffffffff8110687c (kvmclock_disable+0x1c/0x30) kvmclock enabling is gated by CLOCKSOURCE and CLOCKSOURCE2 KVM paravirt features. Do not disable kvmclock if it was not enabled. Signed-off-by:Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Fixes: c02027b5 ("x86/kvm: Disable kvmclock on all CPUs on shutdown") Reviewed-by:
Sean Christopherson <seanjc@google.com> Reviewed-by:
Vitaly Kuznetsov <vkuznets@redhat.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Wanpeng Li <wanpengli@tencent.com> Cc: stable@vger.kernel.org Message-Id: <20231205004510.27164-6-kirill.shutemov@linux.intel.com> Signed-off-by:
Paolo Bonzini <pbonzini@redhat.com> Signed-off-by:
liwei <liwei728@huawei.com>
Loading
Please sign in to comment