bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

x86/alternative: Rename apply_ibt_endbr()

Browse source 
The current name doesn't reflect what it does very well.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Sami Tolvanen <samitolvanen@google.com>
Link: https://lkml.kernel.org/r/20230622144321.427441595%40infradead.org
This commit is contained in:
Peter Zijlstra 2023-06-22 15:36:50 +02:00
parent 0479a42d4c
commit be0fffa5ca
5 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/um/kernel/um_arch.c
View file

@ -437,7 +437,7 @@ void __init arch_cpu_finalize_init(void)
os_check_bugs(); os_check_bugs();
} }
void apply_ibt_endbr(s32 *start, s32 *end) void apply_seal_endbr(s32 *start, s32 *end)
{ {
} }

2
arch/x86/include/asm/alternative.h
View file

@ -96,7 +96,7 @@ extern void alternative_instructions(void);
extern void apply_alternatives(struct alt_instr *start, struct alt_instr *end); extern void apply_alternatives(struct alt_instr *start, struct alt_instr *end);
extern void apply_retpolines(s32 *start, s32 *end); extern void apply_retpolines(s32 *start, s32 *end);
extern void apply_returns(s32 *start, s32 *end); extern void apply_returns(s32 *start, s32 *end);
extern void apply_ibt_endbr(s32 *start, s32 *end); extern void apply_seal_endbr(s32 *start, s32 *end);
extern void apply_fineibt(s32 *start_retpoline, s32 *end_retpoine, extern void apply_fineibt(s32 *start_retpoline, s32 *end_retpoine,
s32 *start_cfi, s32 *end_cfi); s32 *start_cfi, s32 *end_cfi);

2
arch/x86/include/asm/ibt.h
View file

@ -34,7 +34,7 @@
/* /*
* Create a dummy function pointer reference to prevent objtool from marking * Create a dummy function pointer reference to prevent objtool from marking
* the function as needing to be "sealed" (i.e. ENDBR converted to NOP by * the function as needing to be "sealed" (i.e. ENDBR converted to NOP by
* apply_ibt_endbr()). * apply_seal_endbr()).
*/ */
#define IBT_NOSEAL(fname) \ #define IBT_NOSEAL(fname) \
".pushsection .discard.ibt_endbr_noseal\n\t" \ ".pushsection .discard.ibt_endbr_noseal\n\t" \

9
arch/x86/kernel/alternative.c
View file

@ -803,7 +803,7 @@ static void __init_or_module poison_endbr(void *addr, bool warn)
/* /*
* Generated by: objtool --ibt * Generated by: objtool --ibt
*/ */
void __init_or_module noinline apply_ibt_endbr(s32 *start, s32 *end) void __init_or_module noinline apply_seal_endbr(s32 *start, s32 *end)
{ {
s32 *s; s32 *s;
@ -818,7 +818,7 @@ void __init_or_module noinline apply_ibt_endbr(s32 *start, s32 *end)
#else #else
void __init_or_module apply_ibt_endbr(s32 *start, s32 *end) { } void __init_or_module apply_seal_endbr(s32 *start, s32 *end) { }
#endif /* CONFIG_X86_KERNEL_IBT */ #endif /* CONFIG_X86_KERNEL_IBT */
@ -1565,7 +1565,10 @@ void __init alternative_instructions(void)
*/ */
callthunks_patch_builtin_calls(); callthunks_patch_builtin_calls();
apply_ibt_endbr(__ibt_endbr_seal, __ibt_endbr_seal_end); /*
* Seal all functions that do not have their address taken.
*/
apply_seal_endbr(__ibt_endbr_seal, __ibt_endbr_seal_end);
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
/* Patch to UP if other cpus not imminent. */ /* Patch to UP if other cpus not imminent. */

2
arch/x86/kernel/module.c
View file

@ -358,7 +358,7 @@ int module_finalize(const Elf_Ehdr *hdr,
} }
if (ibt_endbr) { if (ibt_endbr) {
void *iseg = (void *)ibt_endbr->sh_addr; void *iseg = (void *)ibt_endbr->sh_addr;
apply_ibt_endbr(iseg, iseg + ibt_endbr->sh_size); apply_seal_endbr(iseg, iseg + ibt_endbr->sh_size);
} }
if (locks) { if (locks) {
void *lseg = (void *)locks->sh_addr; void *lseg = (void *)locks->sh_addr;