Commit 14058f72 authored by Saurabh Sengar's avatar Saurabh Sengar Committed by Wei Liu
Browse files

x86/hyperv: Remove hv_vtl_early_init initcall 



There has been cases reported where HYPERV_VTL_MODE is enabled by mistake,
on a non Hyper-V platforms. This causes the hv_vtl_early_init function to
be called in an non Hyper-V/VTL platforms which results the memory
corruption.

Remove the early_initcall for hv_vtl_early_init and call it at the end of
hyperv_init to make sure it is never called in a non Hyper-V platform by
mistake.

Reported-by: default avatarMathias Krause <minipli@grsecurity.net>
Closes: https://lore.kernel.org/lkml/40467722-f4ab-19a5-4989-308225b1f9f0@grsecurity.net/


Signed-off-by: default avatarSaurabh Sengar <ssengar@linux.microsoft.com>
Acked-by: default avatarMathias Krause <minipli@grsecurity.net>
Signed-off-by: default avatarWei Liu <wei.liu@kernel.org>
Link: https://lore.kernel.org/r/1695358720-27681-1-git-send-email-ssengar@linux.microsoft.com
parent f2a55d08

arch/x86/hyperv/hv_init.c

+3 −0
Original line number Diff line number Diff line
@@ -610,6 +610,9 @@ void __init hyperv_init(void) 
	/* Find the VTL */

	ms_hyperv.vtl = get_vtl();



	if (ms_hyperv.vtl > 0) /* non default VTL */

		hv_vtl_early_init();



	return;



clean_guest_os_id:

arch/x86/hyperv/hv_vtl.c

+1 −2
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static int hv_vtl_wakeup_secondary_cpu(int apicid, unsigned long start_eip) 
	return hv_vtl_bringup_vcpu(vp_id, start_eip);

}



static int __init hv_vtl_early_init(void)

int __init hv_vtl_early_init(void)

{

	/*

	 * `boot_cpu_has` returns the runtime feature support,
@@ -230,4 +230,3 @@ static int __init hv_vtl_early_init(void) 


	return 0;

}
 
early_initcall(hv_vtl_early_init);

arch/x86/include/asm/mshyperv.h

+2 −0
Original line number Diff line number Diff line
@@ -340,8 +340,10 @@ static inline u64 hv_get_non_nested_register(unsigned int reg) { return 0; } 


#ifdef CONFIG_HYPERV_VTL_MODE

void __init hv_vtl_init_platform(void);

int __init hv_vtl_early_init(void);

#else

static inline void __init hv_vtl_init_platform(void) {}

static inline int __init hv_vtl_early_init(void) { return 0; }

#endif



#include <asm-generic/mshyperv.h>