diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-13 19:33:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-13 19:33:23 -0700 |
| commit | a5131c3fdf2608f1c15f3809e201cf540eb28489 (patch) | |
| tree | 52d1dc332caa105adba5eb384101fa944d82bdc4 /arch/x86/entry | |
| parent | 5f487cd8290f3ae742cee18d92f2bb0063dc471c (diff) | |
| parent | 2883f01ec37dd8668e7222dfdb5980c86fdfe277 (diff) | |
Merge tag 'x86-shstk-2024-05-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 shadow stacks from Ingo Molnar:
"Enable shadow stacks for x32.
While we normally don't do such feature-enabling for 32-bit anymore,
this change is small, straightforward & tested on upstream glibc"
* tag 'x86-shstk-2024-05-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/shstk: Enable shadow stacks for x32
Diffstat (limited to 'arch/x86/entry')
| -rw-r--r-- | arch/x86/entry/syscalls/syscall_64.tbl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/entry/syscalls/syscall_64.tbl b/arch/x86/entry/syscalls/syscall_64.tbl index 7e8d46f4147f..cc78226ffc35 100644 --- a/arch/x86/entry/syscalls/syscall_64.tbl +++ b/arch/x86/entry/syscalls/syscall_64.tbl @@ -374,7 +374,7 @@ 450 common set_mempolicy_home_node sys_set_mempolicy_home_node 451 common cachestat sys_cachestat 452 common fchmodat2 sys_fchmodat2 -453 64 map_shadow_stack sys_map_shadow_stack +453 common map_shadow_stack sys_map_shadow_stack 454 common futex_wake sys_futex_wake 455 common futex_wait sys_futex_wait 456 common futex_requeue sys_futex_requeue |