Commit 34289c78 authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Yongqiang Liu
Browse files

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: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Fixes: c02027b5 ("x86/kvm: Disable kvmclock on all CPUs on shutdown")
Reviewed-by: default avatarSean Christopherson <seanjc@google.com>
Reviewed-by: default avatarVitaly 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: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarliwei <liwei728@huawei.com>
parent d7874dfd
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment