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/kernel/shstk.c | |
| 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/kernel/shstk.c')
| -rw-r--r-- | arch/x86/kernel/shstk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/shstk.c b/arch/x86/kernel/shstk.c index 59e15dd8d0f8..6f1e9883f074 100644 --- a/arch/x86/kernel/shstk.c +++ b/arch/x86/kernel/shstk.c @@ -163,8 +163,8 @@ static int shstk_setup(void) if (features_enabled(ARCH_SHSTK_SHSTK)) return 0; - /* Also not supported for 32 bit and x32 */ - if (!cpu_feature_enabled(X86_FEATURE_USER_SHSTK) || in_32bit_syscall()) + /* Also not supported for 32 bit */ + if (!cpu_feature_enabled(X86_FEATURE_USER_SHSTK) || in_ia32_syscall()) return -EOPNOTSUPP; size = adjust_shstk_size(0); |