x86/cfi: Fix CFI rewrite for odd alignments

Browse source

[ Upstream commit 24c8147abb ]

Rustam reported his clang builds did not boot properly; turns out his
.config has: CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B=y set.

Fix up the FineIBT code to deal with this unusual alignment.

Fixes: 931ab63664 ("x86/ibt: Implement FineIBT")
Reported-by: Rustam Kovhaev <rkovhaev@gmail.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: Rustam Kovhaev <rkovhaev@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

...

This commit is contained in:

Peter Zijlstra 2026-02-11 13:59:43 +01:00 • committed by Sasha Levin

parent e58f1a9b06

commit 50b3d683dc

4 changed files with 34 additions and 24 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

12

arch/x86/include/asm/cfi.h

View file

4

arch/x86/include/asm/linkage.h

View file

29

arch/x86/kernel/alternative.c

View file

13

arch/x86/net/bpf_jit_comp.c

View file