diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-14 19:30:17 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-14 19:30:17 +0100 |
| commit | 218cc8b860a255ce7f1a03ff3ec70953c423d27d (patch) | |
| tree | fbd49e5816e523b126a75699c383033128b2e4a5 /arch/x86/include | |
| parent | Merge tag 'sched_urgent_for_v5.16_rc1' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | static_call,x86: Robustify trampoline patching (diff) | |
| download | linux-218cc8b860a255ce7f1a03ff3ec70953c423d27d.tar.xz linux-218cc8b860a255ce7f1a03ff3ec70953c423d27d.zip | |
Merge tag 'locking-urgent-2021-11-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 static call update from Thomas Gleixner:
"A single fix for static calls to make the trampoline patching more
robust by placing explicit signature bytes after the call trampoline
to prevent patching random other jumps like the CFI jump table
entries"
* tag 'locking-urgent-2021-11-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
static_call,x86: Robustify trampoline patching
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/static_call.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/static_call.h b/arch/x86/include/asm/static_call.h index cbb67b6030f9..39ebe0511869 100644 --- a/arch/x86/include/asm/static_call.h +++ b/arch/x86/include/asm/static_call.h @@ -27,6 +27,7 @@ ".globl " STATIC_CALL_TRAMP_STR(name) " \n" \ STATIC_CALL_TRAMP_STR(name) ": \n" \ insns " \n" \ + ".byte 0x53, 0x43, 0x54 \n" \ ".type " STATIC_CALL_TRAMP_STR(name) ", @function \n" \ ".size " STATIC_CALL_TRAMP_STR(name) ", . - " STATIC_CALL_TRAMP_STR(name) " \n" \ ".popsection \n") |