Skip to content

Commit 9053052

Browse files
ardbiesheuvelwilldeacon
authored andcommitted
arm64/boot: Disallow BSS exports to startup code
BSS might be uninitialized when entering the startup code, so forbid the use by the startup code of any variables that live after __bss_start in the linker map. Signed-off-by: Ard Biesheuvel <ardb@kernel.org> Tested-by: Yeoreum Yun <yeoreum.yun@arm.com> Reviewed-by: Yeoreum Yun <yeoreum.yun@arm.com> Link: https://lore.kernel.org/r/20250508114328.2460610-8-ardb+git@google.com [will: Drop export of 'memstart_offset_seed', as this has been removed] Signed-off-by: Will Deacon <will@kernel.org>
1 parent 4afff6c commit 9053052

File tree

2 files changed

+34
-28
lines changed

2 files changed

+34
-28
lines changed

arch/arm64/kernel/image-vars.h

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@
1010
#error This file should only be included in vmlinux.lds.S
1111
#endif
1212

13+
#define PI_EXPORT_SYM(sym) \
14+
__PI_EXPORT_SYM(sym, __pi_ ## sym, Cannot export BSS symbol sym to startup code)
15+
#define __PI_EXPORT_SYM(sym, pisym, msg)\
16+
PROVIDE(pisym = sym); \
17+
ASSERT((sym - KIMAGE_VADDR) < (__bss_start - KIMAGE_VADDR), #msg)
18+
1319
PROVIDE(__efistub_primary_entry = primary_entry);
1420

1521
/*
@@ -36,36 +42,34 @@ PROVIDE(__pi___memcpy = __pi_memcpy);
3642
PROVIDE(__pi___memmove = __pi_memmove);
3743
PROVIDE(__pi___memset = __pi_memset);
3844

39-
PROVIDE(__pi_id_aa64isar1_override = id_aa64isar1_override);
40-
PROVIDE(__pi_id_aa64isar2_override = id_aa64isar2_override);
41-
PROVIDE(__pi_id_aa64mmfr0_override = id_aa64mmfr0_override);
42-
PROVIDE(__pi_id_aa64mmfr1_override = id_aa64mmfr1_override);
43-
PROVIDE(__pi_id_aa64mmfr2_override = id_aa64mmfr2_override);
44-
PROVIDE(__pi_id_aa64pfr0_override = id_aa64pfr0_override);
45-
PROVIDE(__pi_id_aa64pfr1_override = id_aa64pfr1_override);
46-
PROVIDE(__pi_id_aa64smfr0_override = id_aa64smfr0_override);
47-
PROVIDE(__pi_id_aa64zfr0_override = id_aa64zfr0_override);
48-
PROVIDE(__pi_arm64_sw_feature_override = arm64_sw_feature_override);
49-
PROVIDE(__pi_arm64_use_ng_mappings = arm64_use_ng_mappings);
45+
PI_EXPORT_SYM(id_aa64isar1_override);
46+
PI_EXPORT_SYM(id_aa64isar2_override);
47+
PI_EXPORT_SYM(id_aa64mmfr0_override);
48+
PI_EXPORT_SYM(id_aa64mmfr1_override);
49+
PI_EXPORT_SYM(id_aa64mmfr2_override);
50+
PI_EXPORT_SYM(id_aa64pfr0_override);
51+
PI_EXPORT_SYM(id_aa64pfr1_override);
52+
PI_EXPORT_SYM(id_aa64smfr0_override);
53+
PI_EXPORT_SYM(id_aa64zfr0_override);
54+
PI_EXPORT_SYM(arm64_sw_feature_override);
55+
PI_EXPORT_SYM(arm64_use_ng_mappings);
5056
#ifdef CONFIG_CAVIUM_ERRATUM_27456
51-
PROVIDE(__pi_cavium_erratum_27456_cpus = cavium_erratum_27456_cpus);
52-
PROVIDE(__pi_is_midr_in_range_list = is_midr_in_range_list);
57+
PI_EXPORT_SYM(cavium_erratum_27456_cpus);
58+
PI_EXPORT_SYM(is_midr_in_range_list);
5359
#endif
54-
PROVIDE(__pi__ctype = _ctype);
55-
56-
PROVIDE(__pi_swapper_pg_dir = swapper_pg_dir);
57-
58-
PROVIDE(__pi__text = _text);
59-
PROVIDE(__pi__stext = _stext);
60-
PROVIDE(__pi__etext = _etext);
61-
PROVIDE(__pi___start_rodata = __start_rodata);
62-
PROVIDE(__pi___inittext_begin = __inittext_begin);
63-
PROVIDE(__pi___inittext_end = __inittext_end);
64-
PROVIDE(__pi___initdata_begin = __initdata_begin);
65-
PROVIDE(__pi___initdata_end = __initdata_end);
66-
PROVIDE(__pi__data = _data);
67-
PROVIDE(__pi___bss_start = __bss_start);
68-
PROVIDE(__pi__end = _end);
60+
PI_EXPORT_SYM(_ctype);
61+
62+
PI_EXPORT_SYM(swapper_pg_dir);
63+
64+
PI_EXPORT_SYM(_text);
65+
PI_EXPORT_SYM(_stext);
66+
PI_EXPORT_SYM(_etext);
67+
PI_EXPORT_SYM(__start_rodata);
68+
PI_EXPORT_SYM(__inittext_begin);
69+
PI_EXPORT_SYM(__inittext_end);
70+
PI_EXPORT_SYM(__initdata_begin);
71+
PI_EXPORT_SYM(__initdata_end);
72+
PI_EXPORT_SYM(_data);
6973

7074
#ifdef CONFIG_KVM
7175

arch/arm64/kernel/vmlinux.lds.S

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,7 @@ SECTIONS
319319

320320
/* start of zero-init region */
321321
BSS_SECTION(SBSS_ALIGN, 0, 0)
322+
__pi___bss_start = __bss_start;
322323

323324
. = ALIGN(PAGE_SIZE);
324325
__pi_init_pg_dir = .;
@@ -332,6 +333,7 @@ SECTIONS
332333
. = ALIGN(SEGMENT_ALIGN);
333334
__pecoff_data_size = ABSOLUTE(. - __initdata_begin);
334335
_end = .;
336+
__pi__end = .;
335337

336338
STABS_DEBUG
337339
DWARF_DEBUG

0 commit comments

Comments
 (0)