diff options
| author | Ard Biesheuvel <ardb@kernel.org> | 2023-02-06 15:33:07 +0300 |
|---|---|---|
| committer | Ard Biesheuvel <ardb@kernel.org> | 2023-02-09 21:30:54 +0300 |
| commit | 93be2859e26c3be847780c65313da1b261833451 (patch) | |
| tree | 41b20e79a370172ee3630ab3039c5ffa90c73957 /arch/x86/include/asm/ibt.h | |
| parent | 1d959312e2f23c8ee6ed9432a6fa4416b267477b (diff) | |
| download | linux-93be2859e26c3be847780c65313da1b261833451.tar.xz | |
efi: x86: Wire up IBT annotation in memory attributes table
UEFI v2.10 extends the EFI memory attributes table with a flag that
indicates whether or not all RuntimeServicesCode regions were
constructed with ENDBR landing pads, permitting the OS to map these
regions with IBT restrictions enabled.
So let's take this into account on x86 as well.
Suggested-by: Peter Zijlstra <peterz@infradead.org> # ibt_save() changes
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Diffstat (limited to 'arch/x86/include/asm/ibt.h')
| -rw-r--r-- | arch/x86/include/asm/ibt.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/ibt.h b/arch/x86/include/asm/ibt.h index 9b08082a5d9f..baae6b4fea23 100644 --- a/arch/x86/include/asm/ibt.h +++ b/arch/x86/include/asm/ibt.h @@ -74,7 +74,7 @@ static inline bool is_endbr(u32 val) return val == gen_endbr(); } -extern __noendbr u64 ibt_save(void); +extern __noendbr u64 ibt_save(bool disable); extern __noendbr void ibt_restore(u64 save); #else /* __ASSEMBLY__ */ @@ -100,7 +100,7 @@ extern __noendbr void ibt_restore(u64 save); static inline bool is_endbr(u32 val) { return false; } -static inline u64 ibt_save(void) { return 0; } +static inline u64 ibt_save(bool disable) { return 0; } static inline void ibt_restore(u64 save) { } #else /* __ASSEMBLY__ */ |