Commit 523ec840 authored by Dan Carpenter's avatar Dan Carpenter Committed by Wenkuan Wang
Browse files

perf/x86/amd/uncore: Fix uninitialized return value in amd_uncore_init() 

mainline inclusion
from mainline-v6.7-rc1
commit 7543365739a4ff61d40ad53ab68c17d2e7dfb0c9
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9016O


CVE: NA

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

Some of the error paths in this function return don't initialize the
error code.  Return -ENODEV by default.

Fixes: d6389d3ccc13 ("perf/x86/amd/uncore: Refactor uncore management")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/cec62eba-c4b8-4cb7-9671-58894dd4b974@moroto.mountain


Signed-off-by: default avatarWenkuan Wang <Wenkuan.Wang@amd.com>
parent 3d077bb4

arch/x86/events/amd/uncore.c

+2 −1
Original line number Diff line number Diff line
@@ -1009,7 +1009,8 @@ static struct amd_uncore uncores[UNCORE_TYPE_MAX] = { 
static int __init amd_uncore_init(void)

{

	struct amd_uncore *uncore;

	int ret, i;

	int ret = -ENODEV;

	int i;



	if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD &&

	    boot_cpu_data.x86_vendor != X86_VENDOR_HYGON)