diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2014-05-21 10:22:59 -0700 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-09-13 23:41:51 +0100 |
| commit | 9bdfec6bdce53443c9ad5fffa9ad08ef21fe5dc5 (patch) | |
| tree | 57244295c770df764093d1eb584a169c3eeceeff /arch/x86/kernel | |
| parent | bf8b1e9de06c8e5a92d39a97e1b99b901def79d2 (diff) | |
| download | kernel_samsung_smdk4412-9bdfec6bdce53443c9ad5fffa9ad08ef21fe5dc5.zip kernel_samsung_smdk4412-9bdfec6bdce53443c9ad5fffa9ad08ef21fe5dc5.tar.gz kernel_samsung_smdk4412-9bdfec6bdce53443c9ad5fffa9ad08ef21fe5dc5.tar.bz2 | |
Revert "x86-64, modify_ldt: Make support for 16-bit segments a runtime option"
commit 7ed6fb9b5a5510e4ef78ab27419184741169978a upstream.
This reverts commit fa81511bb0bbb2b1aace3695ce869da9762624ff in
preparation of merging in the proper fix (espfix64).
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/ldt.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c index 3e0ccbf..4ac4531 100644 --- a/arch/x86/kernel/ldt.c +++ b/arch/x86/kernel/ldt.c @@ -21,8 +21,6 @@ #include <asm/mmu_context.h> #include <asm/syscalls.h> -int sysctl_ldt16 = 0; - #ifdef CONFIG_SMP static void flush_ldt(void *current_mm) { @@ -237,7 +235,7 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode) * IRET leaking the high bits of the kernel stack address. */ #ifdef CONFIG_X86_64 - if (!ldt_info.seg_32bit && !sysctl_ldt16) { + if (!ldt_info.seg_32bit) { error = -EINVAL; goto out_unlock; } |