moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ANDROID: arm64: module.lds.h: support built-in initcalls

Browse Source 
The FIPS140 module incorporates copies of builtin code, which gets
integrity checked at module load time, and registered in a way that
ensures that the integrity checked versions supersede the builtin ones.
These objects are compiled as builtin code, and so their init hooks will
be exported from the binary in the same way as builtin initcalls are,
i.e., annotated with a level that defines the order in which the hooks
are expected to be invoked.

[ebiggers: separated this out from the original commit 6be141eb36
 ("ANDROID: crypto: fips140 - perform load time integrity check")
 from android12-5.10, since this changes an existing file]

Bug: 153614920
Bug: 188620248
Change-Id: Iac5c3d1a8aa031c236e2c78a5b40f3ceb0b77f83
Signed-off-by: Ard Biesheuvel <ardb@google.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
This commit is contained in:
Ard Biesheuvel
2021-03-23 10:54:38 +01:00
committed by Eric Biggers
parent 7ca824a38c
commit 221d338929
1 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
arch/arm64/include/asm/module.lds.h
View File

@@ -3,6 +3,35 @@ SECTIONS {
.plt 0 (NOLOAD) : { BYTE(0) }
.init.plt 0 (NOLOAD) : { BYTE(0) }
.text.ftrace_trampoline 0 (NOLOAD) : { BYTE(0) }
#ifdef CONFIG_CRYPTO_FIPS140
/*
* The FIPS140 module incorporates copies of builtin code, which gets
* integrity checked at module load time, and registered in a way that
* ensures that the integrity checked versions supersede the builtin
* ones. These objects are compiled as builtin code, and so their init
* hooks will be exported from the binary in the same way as builtin
* initcalls are, i.e., annotated with a level that defines the order
* in which the hooks are expected to be invoked.
*/
#define INIT_CALLS_LEVEL(level) \
KEEP(*(.initcall##level##.init*)) \
KEEP(*(.initcall##level##s.init*))
.initcalls : {
*(.initcalls._start)
INIT_CALLS_LEVEL(0)
INIT_CALLS_LEVEL(1)
INIT_CALLS_LEVEL(2)
INIT_CALLS_LEVEL(3)
INIT_CALLS_LEVEL(4)
INIT_CALLS_LEVEL(5)
INIT_CALLS_LEVEL(rootfs)
INIT_CALLS_LEVEL(6)
INIT_CALLS_LEVEL(7)
*(.initcalls._end)
}
#endif
#endif
#ifdef CONFIG_KASAN_SW_TAGS