Commit a8486dc8 authored by Srinivas Pandruvada's avatar Srinivas Pandruvada Committed by yingbao jia
Browse files

platform/x86: intel-uncore-freq: Prevent driver loading in guests 

mainline inclusion
from mainline-v5.18-rc5
commit 8d75f7b4
category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I78KDD
CVE: NA
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8d75f7b4a3dfd5714a5dc87cfdaa27bd2d14aa48

Intel-SIG: commit 8d75f7b4 platform/x86: intel-uncore-freq: Prevent driver loading in guests.
Backport for intel-uncore-freqe driver

-------------------------------------------------

Loading this driver in guests results in unchecked MSR access error for
MSR 0x620.

There is no use of reading and modifying package/die scope uncore MSRs
in guests. So check for CPU feature X86_FEATURE_HYPERVISOR to prevent
loading of this driver in guests.

Fixes: dbce412a ("platform/x86/intel-uncore-freq: Split common and enumeration part")
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=215870


Suggested-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Link: https://lore.kernel.org/r/20220427100304.2562990-1-srinivas.pandruvada@linux.intel.com


Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avataryingbao jia <yingbao.jia@intel.com>
parent f235ce96

drivers/platform/x86/intel-uncore-frequency.c

+3 −0
Original line number Diff line number Diff line
@@ -449,6 +449,9 @@ static int __init intel_uncore_init(void) 
	const struct x86_cpu_id *id;

	int ret;



	if (cpu_feature_enabled(X86_FEATURE_HYPERVISOR))

		return -ENODEV;



	id = x86_match_cpu(intel_uncore_cpu_ids);

	if (!id)

		return -ENODEV;