Commit f59d4739 authored by Cui GaoSheng's avatar Cui GaoSheng Committed by Zheng Zengkai
Browse files

arm32: kaslr: Print the real kaslr offset when kernel panic 



hulk inclusion
category: bugfix
bugzilla: 47952
CVE: NA

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

The bss section is cleared when the kernel is started, and __kaslr_offset
variable is located in the bss section, __kaslr_offset is reset to zero,
so we move __kaslr_offset from bss section to data section.

Signed-off-by: default avatarCui GaoSheng <cuigaosheng1@huawei.com>
Reviewed-by: default avatarXiu Jianfeng <xiujianfeng@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 9a0e4e77

arch/arm/kernel/head.S

+2 −2
Original line number Diff line number Diff line
@@ -103,11 +103,11 @@ ENTRY(stext) 
#ifdef CONFIG_RANDOMIZE_BASE

	str_l	r3, __kaslr_offset, r9	@ offset in r3 if entered via kaslr ep



	.section ".bss", "aw", %nobits

	.pushsection .data		@ data in bss will be cleared

	.align	2

ENTRY(__kaslr_offset)

	.long	0			@ will be wiped before entering C code

	.previous

	.popsection

#endif



#ifdef CONFIG_ARM_VIRT_EXT