Re: [PATCH v3 12/17] arm64: implement __va_function
From: Mark Rutland <mark.rutland@arm.com>
Date: 2021-03-25 10:38:48
Also in:
bpf, linux-arch, linux-hardening, linux-kbuild, linux-pci, lkml
On Tue, Mar 23, 2021 at 01:39:41PM -0700, Sami Tolvanen wrote:
With CONFIG_CFI_CLANG, the compiler replaces function addresses in instrumented C code with jump table addresses. This change implements the __va_function() macro, which returns the actual function address instead. Signed-off-by: Sami Tolvanen <samitolvanen@google.com> Reviewed-by: Kees Cook <redacted>
Is there really no attribute or builtin that can be used to do this without assembly? IIUC from other patches the symbol tables will contain the "real" non-cfi entry points (unless we explciitly asked to make the jump table address canonical), so AFAICT here the compiler should have all the necessary information to generate either the CFI or non-CFI entry point addresses, even if it doesn't expose an interface for that today. It'd be a lot nicer if we could get the compiler to do this for us. Thanks, Mark.
quoted hunk ↗ jump to hunk
--- arch/arm64/include/asm/memory.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+)diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index 0aabc3be9a75..9a4887808681 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h@@ -321,6 +321,21 @@ static inline void *phys_to_virt(phys_addr_t x) #define virt_to_pfn(x) __phys_to_pfn(__virt_to_phys((unsigned long)(x))) #define sym_to_pfn(x) __phys_to_pfn(__pa_symbol(x)) +#ifdef CONFIG_CFI_CLANG +/* + * With CONFIG_CFI_CLANG, the compiler replaces function address + * references with the address of the function's CFI jump table + * entry. The __va_function macro always returns the address of the + * actual function instead. + */ +#define __va_function(x) ({ \ + void *addr; \ + asm("adrp %0, " __stringify(x) "\n\t" \ + "add %0, %0, :lo12:" __stringify(x) : "=r" (addr)); \ + addr; \ +}) +#endif + /* * virt_to_page(x) convert a _valid_ virtual address to struct page * * virt_addr_valid(x) indicates whether a virtual address is valid-- 2.31.0.291.g576ba9dcdaf-goog
_______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel