Make IA32_EMULATION boot time overridable
Subsystems (4)
v4 cover Make IA32_EMULATION boot time overridable
Here's v4 of the patchset, incorporating latest round of reviews, Namely,
* Split the first patch into 2 - one introducing the ia32_enabled() function which simply return true if IA32_EMULATION is selected.
* Some minor typos (rdunlap)
* Reworked some changelogs.
* Added one final patch which introduces the Kconfig/boot time parameter after everything is predicated on ia32_enabled. This allows the config switch to be fully operable when it's introduced. (tgxl)
* Renamed the runtime parameter name to ia32_emulation and its format to bool.
Nikolay Borisov (6):
x86: Introduce ia32_enabled
x86/entry: Rename ignore_sysret
x86/entry: Compile entry_SYSCALL32_ignore unconditionally x86/elf: Make loading of 32bit processes depend on ia32_enabled() x86/entry: Make IA32 syscalls' availability depend on ia32_enabled()
x86: Make IA32_EMULATION boot time configurable
.../admin-guide/kernel-parameters.txt | 5 +++ arch/x86/Kconfig | 9 +++++ arch/x86/entry/common.c | 20 ++++++++++ arch/x86/entry/entry_64.S | 6 +-- arch/x86/include/asm/elf.h | 3 +- arch/x86/include/asm/ia32.h | 16 +++++++- arch/x86/include/asm/processor.h | 2 +- arch/x86/include/asm/proto.h | 3 ++ arch/x86/kernel/cpu/common.c | 37 ++++++++++--------- arch/x86/kernel/idt.c | 7 ++++ 10 files changed, 83 insertions(+), 25 deletions(-)
--
2.34.1
PATCH v4 1/6 x86: Introduce ia32_enabled()
IA32 support on 64bit kernels depends on whether CONFIG_IA32_EMULATION is selected or not. As it is a compile time option it doesn't provide the flexibility to have distributions set their own policy for IA32 support and give the user the flexibility to override it.
As a first step introduce ia32_enabled() which abstracts whether IA32 compat is turned on or off. Upcoming patches will implement the ability to set IA32 compat state at boot time.
--- arch/x86/entry/common.c | 4 ++++ arch/x86/include/asm/ia32.h | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-)
arch/x86/entry/common.c +4 -0
@@ -96,6 +96,10 @@ static __always_inline int syscall_32_enter(struct pt_regs *regs)return (int )regs->orig_ax; } +#ifdef CONFIG_IA32_EMULATION +bool __ia32_enabled = true; +#endif +/* * Invoke a 32-bit syscall. Called with IRQs on in CONTEXT_KERNEL. */
arch/x86/include/asm/ia32.h +15 -1
@@ -68,6 +68,20 @@ extern void ia32_pick_mmap_layout(struct mm_struct *mm);#endif -#endif /* CONFIG_IA32_EMULATION */ +extern bool __ia32_enabled; + +static inline bool ia32_enabled (void ) +{ +return __ia32_enabled; +} + +#else /* !CONFIG_IA32_EMULATION */ + +static inline bool ia32_enabled (void ) +{ +return IS_ENABLED (CONFIG_X86_32 ); +} + +#endif #endif /* _ASM_X86_IA32_H */
Signature · 1 line
2.34.1
Re: [PATCH v4 1/6] x86: Introduce ia32_enabled()
arch/x86/entry/common.c static __always_inline int syscall_32_enter(struct pt_regs *regs) · line 100
Quoted 3 lines · Nikolay Borisov
arch/x86/entry/common.c +2
-0+#ifdef CONFIG_IA32_EMULATION +bool __ia32_enabled = true;
This wants to be __ro_after_init as it can't change during runtime.
Thanks,
tglx
Re: [PATCH v4 1/6] x86: Introduce ia32_enabled()
Quoted 6 lines · Thomas Gleixner
arch/x86/entry/common.c static __always_inline int syscall_32_enter(struct pt_regs *regs) · line 100
Quoted 3 lines · Nikolay Borisov
arch/x86/entry/common.c +2
-0+#ifdef CONFIG_IA32_EMULATION +bool __ia32_enabled = true;This wants to be
__ro_after_initas it can't change during runtime.
Other than this the series is now in acceptable state. No need to resend. I have fixed it up locally. The series now in the queue for post merge window processing.
Thanks,
tglx
[tip: x86/entry] x86: Introduce ia32_enabled()
In reply to Nikolay BorisovThe following commit has been merged into the x86/entry branch of tip:
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: 1da5c9bc119d3a749b519596b93f9b2667e93c4a Gitweb: https://git.kernel.org/tip/1da5c9bc119d3a749b519596b93f9b2667e93c4a Author: Nikolay Borisov <[email protected]> AuthorDate: Fri, 23 Jun 2023 14:14:04 +03:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Thu, 14 Sep 2023 13:19:53 +02:00
x86: Introduce ia32_enabled()
IA32 support on 64bit kernels depends on whether CONFIG_IA32_EMULATION is selected or not. As it is a compile time option it doesn't provide the flexibility to have distributions set their own policy for IA32 support and give the user the flexibility to override it.
As a first step introduce ia32_enabled() which abstracts whether IA32 compat is turned on or off. Upcoming patches will implement the ability to set IA32 compat state at boot time.
--- arch/x86/entry/common.c | 4 ++++ arch/x86/include/asm/ia32.h | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-)
arch/x86/entry/common.c +4 -0
@@ -96,6 +96,10 @@ static __always_inline int syscall_32_enter(struct pt_regs *regs)return (int )regs->orig_ax; } +#ifdef CONFIG_IA32_EMULATION +bool __ia32_enabled__ro_after_init = true; +#endif +/* * Invoke a 32-bit syscall. Called with IRQs on in CONTEXT_KERNEL. */
arch/x86/include/asm/ia32.h +15 -1
@@ -68,6 +68,20 @@ extern void ia32_pick_mmap_layout(struct mm_struct *mm);#endif -#endif /* CONFIG_IA32_EMULATION */ +extern bool __ia32_enabled; + +static inline bool ia32_enabled (void ) +{ +return __ia32_enabled; +} + +#else /* !CONFIG_IA32_EMULATION */ + +static inline bool ia32_enabled (void ) +{ +return IS_ENABLED (CONFIG_X86_32 ); +} + +#endif #endif /* _ASM_X86_IA32_H */
PATCH v4 2/6 x86/entry: Rename ignore_sysret()
In reply to Nikolay BorisovThe SYSCALL instruction cannot really be disabled in compatibility mode. The best that can be done is to configure the CSTAR msr to point to a minimal handler. Currently this handler has a rather misleading name - ignore_sysret() as it's not really doing anything with sysret.
Give it a more descriptive name.
--- arch/x86/entry/entry_64.S | 4 ++-- arch/x86/include/asm/processor.h | 2 +- arch/x86/kernel/cpu/common.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
arch/x86/entry/entry_64.S +2 -2
@@ -1519,12 +1519,12 @@ SYM_CODE_END(asm_exc_nmi) * This handles SYSCALL from 32-bit code. There is no way to program * MSRs to fully disable 32-bit SYSCALL. */ -SYM_CODE_START(ignore_sysret) +SYM_CODE_START(entry_SYSCALL32_ignore) UNWIND_HINT_END_OF_STACK ENDBR mov $-ENOSYS, %eax sysretl -SYM_CODE_END(ignore_sysret) +SYM_CODE_END(entry_SYSCALL32_ignore) #endif .pushsection .text, "ax"
arch/x86/include/asm/processor.h +1 -1
@@ -399,7 +399,7 @@ static inline unsigned long cpu_kernelmode_gs_base(int cpu)return (unsigned long )per_cpu (fixed_percpu_data.gs_base, cpu); } -extern asmlinkage void ignore_sysret(void); +extern asmlinkage void entry_SYSCALL32_ignore(void);/* Save actual FS/GS selectors and bases to current->thread */ void current_save_fsgs (void );
arch/x86/kernel/cpu/common.c +1 -1
@@ -2066,7 +2066,7 @@ void syscall_init(void) (unsigned long)(cpu_entry_stack(smp_processor_id()) + 1));wrmsrl_safe (MSR_IA32_SYSENTER_EIP , (u64 )entry_SYSENTER_compat);#else -wrmsrl_cstar ((unsigned long )ignore_sysret); +wrmsrl_cstar ((unsigned long )entry_SYSCALL32_ignore);wrmsrl_safe (MSR_IA32_SYSENTER_CS , (u64 )GDT_ENTRY_INVALID_SEG );wrmsrl_safe (MSR_IA32_SYSENTER_ESP ,0ULL );wrmsrl_safe (MSR_IA32_SYSENTER_EIP ,0ULL );
Signature · 1 line
2.34.1
[tip: x86/entry] x86/entry: Rename ignore_sysret()
The following commit has been merged into the x86/entry branch of tip:
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: f71e1d2ff8e6a183bd4004bc97c453ba527b7dc6 Gitweb: https://git.kernel.org/tip/f71e1d2ff8e6a183bd4004bc97c453ba527b7dc6 Author: Nikolay Borisov <[email protected]> AuthorDate: Fri, 23 Jun 2023 14:14:05 +03:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Thu, 14 Sep 2023 13:19:53 +02:00
x86/entry: Rename ignore_sysret()
The SYSCALL instruction cannot really be disabled in compatibility mode. The best that can be done is to configure the CSTAR msr to point to a minimal handler. Currently this handler has a rather misleading name - ignore_sysret() as it's not really doing anything with sysret.
Give it a more descriptive name.
--- arch/x86/entry/entry_64.S | 4 ++-- arch/x86/include/asm/processor.h | 2 +- arch/x86/kernel/cpu/common.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
arch/x86/entry/entry_64.S +2 -2
@@ -1516,12 +1516,12 @@ SYM_CODE_END(asm_exc_nmi) * This handles SYSCALL from 32-bit code. There is no way to program * MSRs to fully disable 32-bit SYSCALL. */ -SYM_CODE_START(ignore_sysret) +SYM_CODE_START(entry_SYSCALL32_ignore) UNWIND_HINT_END_OF_STACK ENDBR mov $-ENOSYS, %eax sysretl -SYM_CODE_END(ignore_sysret) +SYM_CODE_END(entry_SYSCALL32_ignore) #endif .pushsection .text, "ax"
arch/x86/include/asm/processor.h +1 -1
@@ -399,7 +399,7 @@ static inline unsigned long cpu_kernelmode_gs_base(int cpu)return (unsigned long )per_cpu (fixed_percpu_data.gs_base, cpu); } -extern asmlinkage void ignore_sysret(void); +extern asmlinkage void entry_SYSCALL32_ignore(void);/* Save actual FS/GS selectors and bases to current->thread */ void current_save_fsgs (void );
arch/x86/kernel/cpu/common.c +1 -1
@@ -2087,7 +2087,7 @@ void syscall_init(void) (unsigned long)(cpu_entry_stack(smp_processor_id()) + 1));wrmsrl_safe (MSR_IA32_SYSENTER_EIP , (u64 )entry_SYSENTER_compat);#else -wrmsrl_cstar ((unsigned long )ignore_sysret); +wrmsrl_cstar ((unsigned long )entry_SYSCALL32_ignore);wrmsrl_safe (MSR_IA32_SYSENTER_CS , (u64 )GDT_ENTRY_INVALID_SEG );wrmsrl_safe (MSR_IA32_SYSENTER_ESP ,0ULL );wrmsrl_safe (MSR_IA32_SYSENTER_EIP ,0ULL );
PATCH v4 3/6 x86/entry: Compile entry_SYSCALL32_ignore() unconditionally
In reply to Nikolay BorisovTo limit the IA32 exposure on 64bit kernels while keeping the flexibility for the user to enable it when required, the compile time enable/disable via CONFIG_IA32_EMULATION is not good enough and will be complemented with a kernel command line option.
Right now entry_SYSCALL32_ignore() is only compiled when CONFIG_IA32_EMULATION=n, but boot-time enable- / disablement obviously requires it to be unconditionally available.
Remove the #ifndef CONFIG_IA32_EMULATION guard.
--- arch/x86/entry/entry_64.S | 2 -- 1 file changed, 2 deletions(-)
arch/x86/entry/entry_64.S +0 -2
@@ -1514,7 +1514,6 @@ SYM_CODE_START(asm_exc_nmi) iretq SYM_CODE_END(asm_exc_nmi) -#ifndef CONFIG_IA32_EMULATION /* * This handles SYSCALL from 32-bit code. There is no way to program * MSRs to fully disable 32-bit SYSCALL.
@@ -1525,7 +1524,6 @@ SYM_CODE_START(entry_SYSCALL32_ignore) mov $-ENOSYS, %eax sysretl SYM_CODE_END(entry_SYSCALL32_ignore) -#endif .pushsection .text, "ax" __FUNC_ALIGN
Signature · 1 line
2.34.1
[tip: x86/entry] x86/entry: Compile entry_SYSCALL32_ignore() unconditionally
The following commit has been merged into the x86/entry branch of tip:
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: 370dcd58548a360bbf8a65b89b410d09f56bf0c6 Gitweb: https://git.kernel.org/tip/370dcd58548a360bbf8a65b89b410d09f56bf0c6 Author: Nikolay Borisov <[email protected]> AuthorDate: Fri, 23 Jun 2023 14:14:06 +03:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Thu, 14 Sep 2023 13:19:53 +02:00
x86/entry: Compile entry_SYSCALL32_ignore() unconditionally
To limit the IA32 exposure on 64bit kernels while keeping the flexibility for the user to enable it when required, the compile time enable/disable via CONFIG_IA32_EMULATION is not good enough and will be complemented with a kernel command line option.
Right now entry_SYSCALL32_ignore() is only compiled when CONFIG_IA32_EMULATION=n, but boot-time enable- / disablement obviously requires it to be unconditionally available.
Remove the #ifndef CONFIG_IA32_EMULATION guard.
--- arch/x86/entry/entry_64.S | 2 -- 1 file changed, 2 deletions(-)
arch/x86/entry/entry_64.S +0 -2
@@ -1511,7 +1511,6 @@ nmi_restore: iretq SYM_CODE_END(asm_exc_nmi) -#ifndef CONFIG_IA32_EMULATION /* * This handles SYSCALL from 32-bit code. There is no way to program * MSRs to fully disable 32-bit SYSCALL.
@@ -1522,7 +1521,6 @@ SYM_CODE_START(entry_SYSCALL32_ignore) mov $-ENOSYS, %eax sysretl SYM_CODE_END(entry_SYSCALL32_ignore) -#endif .pushsection .text, "ax" __FUNC_ALIGN
PATCH v4 4/6 x86/elf: Make loading of 32bit processes depend on ia32_enabled()
In reply to Nikolay BorisovMajor aspect of ia32 emulation is the ability to load 32bit processes. That's currently decided (among others) by compat_elf_check_arch().
Make the macro use ia32_enabled() to decide if IA32 compat is enabled before loading a 32bit process.
--- arch/x86/include/asm/elf.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/include/asm/elf.h +2 -1
@@ -7,6 +7,7 @@*/ #include <linux/thread_info.h> +#include <asm/ia32.h> #include <asm/ptrace.h> #include <asm/user.h> #include <asm/auxvec.h>
@@ -149,7 +150,7 @@ do { \ ((x)->e_machine == EM_X86_64)#define compat_elf_check_arch (x) \ - (elf_check_arch_ia32(x) || \ + ((elf_check_arch_ia32(x) && ia32_enabled()) || \ (IS_ENABLED(CONFIG_X86_X32_ABI) && (x)->e_machine == EM_X86_64)) static inline void elf_common_init(struct thread_struct *t,
Signature · 1 line
2.34.1
[tip: x86/entry] x86/elf: Make loading of 32bit processes depend on ia32_enabled()
The following commit has been merged into the x86/entry branch of tip:
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: 5ae2702d7c482edbf002499e23a2e22ac4047af1 Gitweb: https://git.kernel.org/tip/5ae2702d7c482edbf002499e23a2e22ac4047af1 Author: Nikolay Borisov <[email protected]> AuthorDate: Fri, 23 Jun 2023 14:14:07 +03:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Thu, 14 Sep 2023 13:19:53 +02:00
x86/elf: Make loading of 32bit processes depend on ia32_enabled()
Major aspect of ia32 emulation is the ability to load 32bit processes. That's currently decided (among others) by compat_elf_check_arch().
Make the macro use ia32_enabled() to decide if IA32 compat is enabled before loading a 32bit process.
--- arch/x86/include/asm/elf.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/include/asm/elf.h +2 -1
@@ -7,6 +7,7 @@*/ #include <linux/thread_info.h> +#include <asm/ia32.h> #include <asm/ptrace.h> #include <asm/user.h> #include <asm/auxvec.h>
@@ -149,7 +150,7 @@ do { \ ((x)->e_machine == EM_X86_64)#define compat_elf_check_arch (x) \ - (elf_check_arch_ia32(x) || \ + ((elf_check_arch_ia32(x) && ia32_enabled()) || \ (IS_ENABLED(CONFIG_X86_X32_ABI) && (x)->e_machine == EM_X86_64)) static inline void elf_common_init(struct thread_struct *t,
PATCH v4 5/6 x86/entry: Make IA32 syscalls' availability depend on ia32_enabled()
In reply to Nikolay BorisovAnother major aspect of supporting running of 32bit processes is the ability to access 32bit syscalls. Such syscalls can be invoked by using the legacy int 0x80 handler and sysenter/syscall instructions.
If IA32 emulation is disabled ensure that each of those 3 distinct mechanisms are also disabled. For int 0x80 a #GP exception would be generated since the respective descriptor is not going to be loaded at all. Invoking sysenter will also result in a #GP since IA32_SYSENTER_CS contains an invalid segment. Finally, syscall instruction cannot really be disabled so it's configured to execute a minimal handler.
--- arch/x86/include/asm/proto.h | 3 +++ arch/x86/kernel/cpu/common.c | 37 ++++++++++++++++++------------------ arch/x86/kernel/idt.c | 7 +++++++ 3 files changed, 29 insertions(+), 18 deletions(-)
arch/x86/include/asm/proto.h +3 -0
@@ -36,6 +36,9 @@ void entry_INT80_compat(void);#ifdef CONFIG_XEN_PV void xen_entry_INT80_compat (void );#endif +#else /* !CONFIG_IA32_EMULATION */ +#define entry_SYSCALL_compat NULL +#define entry_SYSENTER_compat NULL#endif void x86_configure_nx (void );
arch/x86/kernel/cpu/common.c +19 -18
@@ -59,6 +59,7 @@#include <asm/intel-family.h> #include <asm/cpu_device_id.h> #include <asm/uv/uv.h> +#include <asm/ia32.h> #include <asm/sigframe.h> #include <asm/traps.h> #include <asm/sev.h>
@@ -2053,24 +2054,24 @@ void syscall_init(void)wrmsr (MSR_STAR ,0 , (__USER32_CS <<16 ) | __KERNEL_CS);wrmsrl (MSR_LSTAR , (unsigned long )entry_SYSCALL_64); -#ifdef CONFIG_IA32_EMULATION -wrmsrl_cstar ((unsigned long )entry_SYSCALL_compat); -/* -* This only works on Intel CPUs. -* On AMD CPUs these MSRs are 32-bit, CPU truncates MSR_IA32_SYSENTER_EIP. -* This does not cause SYSENTER to jump to the wrong location, because -* AMD doesn't allow SYSENTER in long mode (either 32- or 64-bit). -*/ -wrmsrl_safe (MSR_IA32_SYSENTER_CS , (u64 )__KERNEL_CS); -wrmsrl_safe (MSR_IA32_SYSENTER_ESP , - (unsigned long )(cpu_entry_stack (smp_processor_id ()) +1 )); -wrmsrl_safe (MSR_IA32_SYSENTER_EIP , (u64 )entry_SYSENTER_compat); -#else -wrmsrl_cstar ((unsigned long )entry_SYSCALL32_ignore); -wrmsrl_safe (MSR_IA32_SYSENTER_CS , (u64 )GDT_ENTRY_INVALID_SEG ); -wrmsrl_safe (MSR_IA32_SYSENTER_ESP ,0ULL ); -wrmsrl_safe (MSR_IA32_SYSENTER_EIP ,0ULL ); -#endif +if (ia32_enabled ()) { +wrmsrl_cstar ((unsigned long )entry_SYSCALL_compat); +/* +* This only works on Intel CPUs. +* On AMD CPUs these MSRs are 32-bit, CPU truncates MSR_IA32_SYSENTER_EIP. +* This does not cause SYSENTER to jump to the wrong location, because +* AMD doesn't allow SYSENTER in long mode (either 32- or 64-bit). +*/ +wrmsrl_safe (MSR_IA32_SYSENTER_CS , (u64 )__KERNEL_CS); +wrmsrl_safe (MSR_IA32_SYSENTER_ESP , + (unsigned long )(cpu_entry_stack (smp_processor_id ()) +1 )); +wrmsrl_safe (MSR_IA32_SYSENTER_EIP , (u64 )entry_SYSENTER_compat); + }else { +wrmsrl_cstar ((unsigned long )entry_SYSCALL32_ignore); +wrmsrl_safe (MSR_IA32_SYSENTER_CS , (u64 )GDT_ENTRY_INVALID_SEG ); +wrmsrl_safe (MSR_IA32_SYSENTER_ESP ,0ULL ); +wrmsrl_safe (MSR_IA32_SYSENTER_EIP ,0ULL ); + }/* * Flags to clear on syscall; clear as much as possible
arch/x86/kernel/idt.c +7 -0
@@ -10,6 +10,7 @@#include <asm/proto.h> #include <asm/desc.h> #include <asm/hw_irq.h> +#include <asm/ia32.h> #include <asm/idtentry.h> #define DPL0 0x0
@@ -116,6 +117,9 @@ static const __initconst struct idt_data def_idts[] = {#endif SYSG(X86_TRAP_OF, asm_exc_overflow), +}; + +static const struct idt_data ia32_idt[]__initconst = { #if defined(CONFIG_IA32_EMULATION)SYSG (IA32_SYSCALL_VECTOR , entry_INT80_compat), #elif defined(CONFIG_X86_32)
@@ -226,6 +230,9 @@ void __init idt_setup_early_traps(void)void __init idt_setup_traps (void ) {idt_setup_from_table (idt_table, def_idts,ARRAY_SIZE (def_idts), true); + +if (ia32_enabled ()) +idt_setup_from_table (idt_table, ia32_idt,ARRAY_SIZE (ia32_idt), true); }#ifdef CONFIG_X86_64
Signature · 1 line
2.34.1
[tip: x86/entry] x86/entry: Make IA32 syscalls' availability depend on ia32_enabled()
The following commit has been merged into the x86/entry branch of tip:
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: 61382281e9054df523d3f9cfdba2faff88955f97 Gitweb: https://git.kernel.org/tip/61382281e9054df523d3f9cfdba2faff88955f97 Author: Nikolay Borisov <[email protected]> AuthorDate: Fri, 23 Jun 2023 14:14:08 +03:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Thu, 14 Sep 2023 13:19:53 +02:00
x86/entry: Make IA32 syscalls' availability depend on ia32_enabled()
Another major aspect of supporting running of 32bit processes is the ability to access 32bit syscalls. Such syscalls can be invoked by using the legacy int 0x80 handler and sysenter/syscall instructions.
If IA32 emulation is disabled ensure that each of those 3 distinct mechanisms are also disabled. For int 0x80 a #GP exception would be generated since the respective descriptor is not going to be loaded at all. Invoking sysenter will also result in a #GP since IA32_SYSENTER_CS contains an invalid segment. Finally, syscall instruction cannot really be disabled so it's configured to execute a minimal handler.
--- arch/x86/include/asm/proto.h | 3 +++- arch/x86/kernel/cpu/common.c | 37 +++++++++++++++++------------------ arch/x86/kernel/idt.c | 7 +++++++- 3 files changed, 29 insertions(+), 18 deletions(-)
arch/x86/include/asm/proto.h +3 -0
@@ -36,6 +36,9 @@ void entry_INT80_compat(void);#ifdef CONFIG_XEN_PV void xen_entry_INT80_compat (void );#endif +#else /* !CONFIG_IA32_EMULATION */ +#define entry_SYSCALL_compat NULL +#define entry_SYSENTER_compat NULL#endif void x86_configure_nx (void );
arch/x86/kernel/cpu/common.c +19 -18
@@ -62,6 +62,7 @@#include <asm/intel-family.h> #include <asm/cpu_device_id.h> #include <asm/uv/uv.h> +#include <asm/ia32.h> #include <asm/set_memory.h> #include <asm/traps.h> #include <asm/sev.h>
@@ -2074,24 +2075,24 @@ void syscall_init(void)wrmsr (MSR_STAR ,0 , (__USER32_CS <<16 ) | __KERNEL_CS);wrmsrl (MSR_LSTAR , (unsigned long )entry_SYSCALL_64); -#ifdef CONFIG_IA32_EMULATION -wrmsrl_cstar ((unsigned long )entry_SYSCALL_compat); -/* -* This only works on Intel CPUs. -* On AMD CPUs these MSRs are 32-bit, CPU truncates MSR_IA32_SYSENTER_EIP. -* This does not cause SYSENTER to jump to the wrong location, because -* AMD doesn't allow SYSENTER in long mode (either 32- or 64-bit). -*/ -wrmsrl_safe (MSR_IA32_SYSENTER_CS , (u64 )__KERNEL_CS); -wrmsrl_safe (MSR_IA32_SYSENTER_ESP , - (unsigned long )(cpu_entry_stack (smp_processor_id ()) +1 )); -wrmsrl_safe (MSR_IA32_SYSENTER_EIP , (u64 )entry_SYSENTER_compat); -#else -wrmsrl_cstar ((unsigned long )entry_SYSCALL32_ignore); -wrmsrl_safe (MSR_IA32_SYSENTER_CS , (u64 )GDT_ENTRY_INVALID_SEG ); -wrmsrl_safe (MSR_IA32_SYSENTER_ESP ,0ULL ); -wrmsrl_safe (MSR_IA32_SYSENTER_EIP ,0ULL ); -#endif +if (ia32_enabled ()) { +wrmsrl_cstar ((unsigned long )entry_SYSCALL_compat); +/* +* This only works on Intel CPUs. +* On AMD CPUs these MSRs are 32-bit, CPU truncates MSR_IA32_SYSENTER_EIP. +* This does not cause SYSENTER to jump to the wrong location, because +* AMD doesn't allow SYSENTER in long mode (either 32- or 64-bit). +*/ +wrmsrl_safe (MSR_IA32_SYSENTER_CS , (u64 )__KERNEL_CS); +wrmsrl_safe (MSR_IA32_SYSENTER_ESP , + (unsigned long )(cpu_entry_stack (smp_processor_id ()) +1 )); +wrmsrl_safe (MSR_IA32_SYSENTER_EIP , (u64 )entry_SYSENTER_compat); + }else { +wrmsrl_cstar ((unsigned long )entry_SYSCALL32_ignore); +wrmsrl_safe (MSR_IA32_SYSENTER_CS , (u64 )GDT_ENTRY_INVALID_SEG ); +wrmsrl_safe (MSR_IA32_SYSENTER_ESP ,0ULL ); +wrmsrl_safe (MSR_IA32_SYSENTER_EIP ,0ULL ); + }/* * Flags to clear on syscall; clear as much as possible
arch/x86/kernel/idt.c +7 -0
@@ -10,6 +10,7 @@#include <asm/proto.h> #include <asm/desc.h> #include <asm/hw_irq.h> +#include <asm/ia32.h> #include <asm/idtentry.h> #define DPL0 0x0
@@ -116,6 +117,9 @@ static const __initconst struct idt_data def_idts[] = {#endif SYSG(X86_TRAP_OF, asm_exc_overflow), +}; + +static const struct idt_data ia32_idt[]__initconst = { #if defined(CONFIG_IA32_EMULATION)SYSG (IA32_SYSCALL_VECTOR , entry_INT80_compat), #elif defined(CONFIG_X86_32)
@@ -225,6 +229,9 @@ void __init idt_setup_early_traps(void)void __init idt_setup_traps (void ) {idt_setup_from_table (idt_table, def_idts,ARRAY_SIZE (def_idts), true); + +if (ia32_enabled ()) +idt_setup_from_table (idt_table, ia32_idt,ARRAY_SIZE (ia32_idt), true); }#ifdef CONFIG_X86_64
PATCH v4 6/6 x86: Make IA32_EMULATION boot time configurable
In reply to Nikolay BorisovDistributions would like to reduce their attack surface as much as possible but at the same time they'd want to retain flexibility to cater to a variety of legacy software. This stems from the conjecture that compat layer is likely rarely tested and could have latent security bugs. Ideally distributions will set their default policy and also give users the ability to override it as appropriate.
To enable this use case, introduce CONFIG_IA32_EMULATION_DEFAULT_DISABLED compile time option, which controls whether 32bit processes/syscalls should be allowed or not. This option is aimed mainly at distributions to set their preferred default behavior in their kernels.
To allow users to override the distro's policy, introduce the 'ia32_emulation' parameter which allows overriding CONFIG_IA32_EMULATION_DEFAULT_DISABLED state at boot time.
--- Documentation/admin-guide/kernel-parameters.txt | 6 ++++++ arch/x86/Kconfig | 9 +++++++++ arch/x86/entry/common.c | 9 ++++++++- 3 files changed, 23 insertions(+), 1 deletion(-)
Documentation/admin-guide/kernel-parameters.txt +6 -0
@@ -1865,6 +1865,12 @@ 0 -- machine default 1 -- force brightness inversion + ia32_emulation= [X86-64] + Format: <bool> + When true, allows loading 32-bit programs and executing 32-bit + syscalls, essentially overriding IA32_EMULATION_DEFAULT_DISABLED at + boot time. When false, unconditionally disables IA32 emulation. + icn= [HW,ISDN] Format: <io>[,<membase>[,<icn_id>[,<icn_id2>]]]
arch/x86/Kconfig +9 -0
@@ -3038,6 +3038,15 @@ config IA32_EMULATION 64-bit kernel. You should likely turn this on, unless you're 100% sure that you don't have any 32-bit programs left. +config IA32_EMULATION_DEFAULT_DISABLED + bool "IA32 emulation disabled by default" + default n + depends on IA32_EMULATION + help + Make IA32 emulation disabled by default. This prevents loading 32-bit + processes and access to 32-bit syscalls. If unsure, leave it to its + default value. + config X86_X32_ABI bool "x32 ABI for 64-bit mode" depends on X86_64
arch/x86/entry/common.c +8 -1
@@ -19,6 +19,7 @@#include <linux/nospec.h> #include <linux/syscalls.h> #include <linux/uaccess.h> +#include <linux/init.h> #ifdef CONFIG_XEN_PV #include <xen/xen-ops.h>
@@ -97,7 +98,13 @@ static __always_inline int syscall_32_enter(struct pt_regs *regs) }#ifdef CONFIG_IA32_EMULATION -bool __ia32_enabled = true; +bool __ia32_enabled = !IS_ENABLED (CONFIG_IA32_EMULATION_DEFAULT_DISABLED ); + +static int ia32_emulation_override_cmdline (char *arg) +{ +return kstrtobool (arg, &__ia32_enabled); +} +early_param ("ia32_emulation" , ia32_emulation_override_cmdline);#endif /*
Signature · 1 line
2.34.1
[tip: x86/entry] x86: Make IA32_EMULATION boot time configurable
The following commit has been merged into the x86/entry branch of tip:
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: a11e097504ac1889b35b6858f495565838325f88 Gitweb: https://git.kernel.org/tip/a11e097504ac1889b35b6858f495565838325f88 Author: Nikolay Borisov <[email protected]> AuthorDate: Fri, 23 Jun 2023 14:14:09 +03:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Thu, 14 Sep 2023 13:19:53 +02:00
x86: Make IA32_EMULATION boot time configurable
Distributions would like to reduce their attack surface as much as possible but at the same time they'd want to retain flexibility to cater to a variety of legacy software. This stems from the conjecture that compat layer is likely rarely tested and could have latent security bugs. Ideally distributions will set their default policy and also give users the ability to override it as appropriate.
To enable this use case, introduce CONFIG_IA32_EMULATION_DEFAULT_DISABLED compile time option, which controls whether 32bit processes/syscalls should be allowed or not. This option is aimed mainly at distributions to set their preferred default behavior in their kernels.
To allow users to override the distro's policy, introduce the 'ia32_emulation' parameter which allows overriding CONFIG_IA32_EMULATION_DEFAULT_DISABLED state at boot time.
--- Documentation/admin-guide/kernel-parameters.txt | 6 ++++++ arch/x86/Kconfig | 9 +++++++++ arch/x86/entry/common.c | 9 ++++++++- 3 files changed, 23 insertions(+), 1 deletion(-)
Documentation/admin-guide/kernel-parameters.txt +6 -0
@@ -1893,6 +1893,12 @@ 0 -- machine default 1 -- force brightness inversion + ia32_emulation= [X86-64] + Format: <bool> + When true, allows loading 32-bit programs and executing 32-bit + syscalls, essentially overriding IA32_EMULATION_DEFAULT_DISABLED at + boot time. When false, unconditionally disables IA32 emulation. + icn= [HW,ISDN] Format: <io>[,<membase>[,<icn_id>[,<icn_id2>]]]
arch/x86/Kconfig +9 -0
@@ -2954,6 +2954,15 @@ config IA32_EMULATION 64-bit kernel. You should likely turn this on, unless you're 100% sure that you don't have any 32-bit programs left. +config IA32_EMULATION_DEFAULT_DISABLED + bool "IA32 emulation disabled by default" + default n + depends on IA32_EMULATION + help + Make IA32 emulation disabled by default. This prevents loading 32-bit + processes and access to 32-bit syscalls. If unsure, leave it to its + default value. + config X86_X32_ABI bool "x32 ABI for 64-bit mode" depends on X86_64
arch/x86/entry/common.c +8 -1
@@ -19,6 +19,7 @@#include <linux/nospec.h> #include <linux/syscalls.h> #include <linux/uaccess.h> +#include <linux/init.h> #ifdef CONFIG_XEN_PV #include <xen/xen-ops.h>
@@ -97,7 +98,13 @@ static __always_inline int syscall_32_enter(struct pt_regs *regs) }#ifdef CONFIG_IA32_EMULATION -bool __ia32_enabled__ro_after_init = true; +bool __ia32_enabled__ro_after_init = !IS_ENABLED (CONFIG_IA32_EMULATION_DEFAULT_DISABLED ); + +static int ia32_emulation_override_cmdline (char *arg) +{ +return kstrtobool (arg, &__ia32_enabled); +} +early_param ("ia32_emulation" , ia32_emulation_override_cmdline);#endif /*