Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04464eb2 authored by Sami Tolvanen's avatar Sami Tolvanen Committed by Alistair Strachan
Browse files

ANDROID: arm64: disable CFI for cpu_replace_ttbr1 



Disable CFI to allow an indirect call to a physical address.

Bug: 67506682
Bug: 133186739
Change-Id: I0ec38f34245a4ad52f508f6989093526d3bf442f
Signed-off-by: default avatarSami Tolvanen <samitolvanen@google.com>
parent f904253e

arch/arm64/include/asm/mmu_context.h

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,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 *pgdp)

static inline void __nocfi cpu_replace_ttbr1(pgd_t *pgdp)

{

	typedef void (ttbr_replace_func)(phys_addr_t);

	extern ttbr_replace_func idmap_cpu_replace_ttbr1;