Commit d8e31b4b authored by Sean Christopherson's avatar Sean Christopherson Committed by Jialin Zhang
Browse files

x86/kasan: Rename local CPU_ENTRY_AREA variables to shorten names 

mainline inclusion
from mainline-v6.2-rc1
commit 7077d2cc
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I6C6UC
CVE: CVE-2023-0597

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=7077d2ccb94dafd00b29cc2d601c9f6891648f5b



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

Rename the CPU entry area variables in kasan_init() to shorten their
names, a future fix will reference the beginning of the per-CPU portion
of the CPU entry area, and shadow_cpu_entry_per_cpu_begin is a bit much.

No functional change intended.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarAndrey Ryabinin <ryabinin.a.a@gmail.com>
Link: https://lkml.kernel.org/r/20221110203504.1985010-4-seanjc@google.com


Signed-off-by: default avatarTong Tiangen <tongtiangen@huawei.com>
Reviewed-by: default avatarWang Weiyang <wangweiyang2@huawei.com>
Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parent 8706d8f9

arch/x86/mm/kasan_init_64.c

+11 −11
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ void __init kasan_populate_shadow_for_vaddr(void *va, size_t size, int nid) 
void __init kasan_init(void)

{

	int i;

	void *shadow_cpu_entry_begin, *shadow_cpu_entry_end;

	void *shadow_cea_begin, *shadow_cea_end;



	memcpy(early_top_pgt, init_top_pgt, sizeof(early_top_pgt));
@@ -374,16 +374,16 @@ void __init kasan_init(void) 
		map_range(&pfn_mapped[i]);

	}



	shadow_cpu_entry_begin = (void *)CPU_ENTRY_AREA_BASE;

	shadow_cpu_entry_begin = kasan_mem_to_shadow(shadow_cpu_entry_begin);

	shadow_cpu_entry_begin = (void *)round_down(

			(unsigned long)shadow_cpu_entry_begin, PAGE_SIZE);

	shadow_cea_begin = (void *)CPU_ENTRY_AREA_BASE;

	shadow_cea_begin = kasan_mem_to_shadow(shadow_cea_begin);

	shadow_cea_begin = (void *)round_down(

			(unsigned long)shadow_cea_begin, PAGE_SIZE);



	shadow_cpu_entry_end = (void *)(CPU_ENTRY_AREA_BASE +

	shadow_cea_end = (void *)(CPU_ENTRY_AREA_BASE +

					CPU_ENTRY_AREA_MAP_SIZE);

	shadow_cpu_entry_end = kasan_mem_to_shadow(shadow_cpu_entry_end);

	shadow_cpu_entry_end = (void *)round_up(

			(unsigned long)shadow_cpu_entry_end, PAGE_SIZE);

	shadow_cea_end = kasan_mem_to_shadow(shadow_cea_end);

	shadow_cea_end = (void *)round_up(

			(unsigned long)shadow_cea_end, PAGE_SIZE);



	kasan_populate_early_shadow(

		kasan_mem_to_shadow((void *)PAGE_OFFSET + MAXMEM),
@@ -405,9 +405,9 @@ void __init kasan_init(void) 


	kasan_populate_early_shadow(

		kasan_mem_to_shadow((void *)VMALLOC_END + 1),

		shadow_cpu_entry_begin);

		shadow_cea_begin);



	kasan_populate_early_shadow(shadow_cpu_entry_end,

	kasan_populate_early_shadow(shadow_cea_end,

			kasan_mem_to_shadow((void *)__START_KERNEL_map));



	kasan_populate_shadow((unsigned long)kasan_mem_to_shadow(_stext),