[PATCH v30 05/10] x86/cet/ibt: Update ELF header parsing for Indirect Branch Tracking
flat view
STALE1884d
From: Yu-cheng Yu <hidden>
Date: 2021-08-30 18:23:54
Also in:
linux-arch, linux-doc, linux-mm, lkml
Subsystem:
the rest, x86 architecture (32-bit and 64-bit) · Maintainers:
Linus Torvalds, Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen
Revision v30 (20 revisions archived).
Revisions (20)
- v9
- v12 [diff against previous]
- v13 [diff against previous]
- v14 [diff against previous]
- v15 [diff against previous]
- v16 [diff against previous]
- v17 [diff against previous]
- v18 [diff against previous]
- v19 [diff against previous]
- v20 [diff against previous]
- v21 [diff against previous]
- v22 [diff against previous]
- v23 [diff against previous]
- v24 [diff against previous]
- v25 [diff against previous]
- v26 [diff against previous]
- v27 [diff against previous]
- v28 [diff against previous]
- v29 [diff against previous]
- v30 current [diff against previous]
An ELF file's .note.gnu.property indicates features the file supports. The property is parsed at loading time and passed to arch_setup_elf_ property(). Update it for Indirect Branch Tracking. Signed-off-by: Yu-cheng Yu <redacted> Cc: Kees Cook <redacted> --- v27: - Remove selecting of ARCH_USE_GNU_PROPERTY and ARCH_BINFMT_ELF_STATE, since they are already selected by X86_64. --- arch/x86/kernel/process_64.c | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
index 4271963fdd8c..4ab751a5146e 100644
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c@@ -884,6 +884,12 @@ int arch_setup_elf_property(struct arch_elf_state *state) if (state->gnu_property & GNU_PROPERTY_X86_FEATURE_1_SHSTK) r = shstk_setup(); + + if (r < 0) + return r; + + if (state->gnu_property & GNU_PROPERTY_X86_FEATURE_1_IBT) + r = ibt_setup(); #endif return r;
--
2.21.0