diff options
| author | Ingo Molnar <[email protected]> | 2015-01-28 14:30:32 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2015-01-28 14:30:32 +0000 |
| commit | 41ca5d4e9be11ea6ae040b51d9628a189fd82896 (patch) | |
| tree | f9c35cc37b9622f6cccd91b94548f44b9a534029 /arch/x86/mm/mpx.c | |
| parent | x86_64 entry: Fix RCX for ptraced syscalls (diff) | |
| parent | x86, tls: Interpret an all-zero struct user_desc as "no segment" (diff) | |
| download | kernel-41ca5d4e9be11ea6ae040b51d9628a189fd82896.tar.gz kernel-41ca5d4e9be11ea6ae040b51d9628a189fd82896.zip | |
Merge commit 3669ef9fa7d3 ("x86, tls: Interpret an all-zero struct user_desc as 'no segment'") into x86/asm
Pick up the latestest asm fixes before advancing it any further.
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'arch/x86/mm/mpx.c')
| -rw-r--r-- | arch/x86/mm/mpx.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/mm/mpx.c b/arch/x86/mm/mpx.c index 67ebf5751222..c439ec478216 100644 --- a/arch/x86/mm/mpx.c +++ b/arch/x86/mm/mpx.c @@ -349,6 +349,12 @@ static __user void *task_get_bounds_dir(struct task_struct *tsk) return MPX_INVALID_BOUNDS_DIR; /* + * 32-bit binaries on 64-bit kernels are currently + * unsupported. + */ + if (IS_ENABLED(CONFIG_X86_64) && test_thread_flag(TIF_IA32)) + return MPX_INVALID_BOUNDS_DIR; + /* * The bounds directory pointer is stored in a register * only accessible if we first do an xsave. */ |