arm64: use function_nocfi with __pa_symbol

Browse source

With CONFIG_CFI_CLANG, the compiler replaces function address
references with the address of the function's CFI jump table
entry. This means that __pa_symbol(function) returns the physical
address of the jump table entry, which can lead to address space
confusion as the jump table points to the function's virtual
address. Therefore, use the function_nocfi() macro to ensure we are
always taking the address of the actual function instead.

Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Tested-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20210408182843.1754385-14-samitolvanen@google.com

...

This commit is contained in:

Sami Tolvanen 2021-04-08 11:28:38 -07:00 • committed by Kees Cook

parent 4ecfca8989

commit bde33977bf

6 changed files with 9 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

arch/arm64/include/asm/mmu_context.h

View file

3

arch/arm64/kernel/acpi_parking_protocol.c

View file

2

arch/arm64/kernel/cpu-reset.h

View file

2

arch/arm64/kernel/cpufeature.c

View file

3

arch/arm64/kernel/psci.c

View file

3

arch/arm64/kernel/smp_spin_table.c

View file