diff options
| author | Sami Tolvanen <samitolvanen@google.com> | 2017-08-18 14:31:23 -0700 |
|---|---|---|
| committer | Sami Tolvanen <samitolvanen@google.com> | 2018-04-26 16:03:37 -0700 |
| commit | 2b5ee2e8c5f44f175710d446adb07a8eb992844d (patch) | |
| tree | c0974b6f23e5dcdf625faaf29b46835816c43e4a | |
| parent | 926c9941d261ccdb81c81be63cb9e6b03498f5e5 (diff) | |
ANDROID: arm64: disable CFI for cpu_replace_ttbr1
Disable CFI to allow an indirect call to a physical address.
Bug: 67506682
Change-Id: I0ec38f34245a4ad52f508f6989093526d3bf442f
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
| -rw-r--r-- | arch/arm64/include/asm/mmu_context.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/mmu_context.h b/arch/arm64/include/asm/mmu_context.h index 779d7a2ec5ec..f7ff06580721 100644 --- a/arch/arm64/include/asm/mmu_context.h +++ b/arch/arm64/include/asm/mmu_context.h @@ -132,7 +132,7 @@ static inline void cpu_install_idmap(void) * Atomically replaces the active TTBR1_EL1 PGD with a new VA-compatible PGD, * avoiding the possibility of conflicting TLB entries being allocated. */ -static inline void cpu_replace_ttbr1(pgd_t *pgd) +static inline void __nocfi cpu_replace_ttbr1(pgd_t *pgd) { typedef void (ttbr_replace_func)(phys_addr_t); extern ttbr_replace_func idmap_cpu_replace_ttbr1; |