arm64: fixmap: make FIX_TEXT_POKE0 permanent

The FIX_TEXT_POKE0 is currently at the end of the temporary fixmap
slots, despite the fact that it can be used at any point during runtime
(e.g. for poking the text of loaded modules), and thus should be a
permanent fixmap slot (as is the case on arm and x86).

This patch moves FIX_TEXT_POKE0 into the set of permanent fixmap slots.

Cc: Catalin Marinas <[email protected]>
Cc: Kees Cook <[email protected]>
Acked-by: Ard Biesheuvel <[email protected]>
Acked-by: Laura Abbott <[email protected]>
Signed-off-by: Mark Rutland <[email protected]>
Signed-off-by: Will Deacon <[email protected]>

diff --git a/arch/arm64/include/asm/fixmap.h b/arch/arm64/include/asm/fixmap.h
index defa0ff982509c19928db8937097e714cc5e8c54..92649568655474296e38f1f49697bf25ec3b0b75 100644 (file)
--- a/arch/arm64/include/asm/fixmap.h
+++ b/arch/arm64/include/asm/fixmap.h
@@ -33,6 +33,7 @@
 enum fixed_addresses {
        FIX_HOLE,
        FIX_EARLYCON_MEM_BASE,
+       FIX_TEXT_POKE0,
        __end_of_permanent_fixed_addresses,
 
        /*
@@ -49,7 +50,6 @@ enum fixed_addresses {
 
        FIX_BTMAP_END = __end_of_permanent_fixed_addresses,
        FIX_BTMAP_BEGIN = FIX_BTMAP_END + TOTAL_FIX_BTMAPS - 1,
-       FIX_TEXT_POKE0,
        __end_of_fixed_addresses
 };