Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

Revert "x86-64, modify_ldt: Make support for 16-bit segments a runtime option"

Browse source 
commit 7ed6fb9b5a upstream.

This reverts commit fa81511bb0 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>
This commit is contained in:
H. Peter Anvin 2014-05-21 10:22:59 -07:00 committed by Greg Kroah-Hartman
parent fbbb720896
commit 6c7e43ada5
2 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/x86/kernel/ldt.c
View file

@ -20,8 +20,6 @@
#include <asm/mmu_context.h>
#include <asm/syscalls.h>
int sysctl_ldt16 = 0;
#ifdef CONFIG_SMP
static void flush_ldt(void *current_mm)
{
@ -236,7 +234,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;
}

8
arch/x86/vdso/vdso32-setup.c
View file

@ -41,7 +41,6 @@ enum {
#ifdef CONFIG_X86_64
#define vdso_enabled sysctl_vsyscall32
#define arch_setup_additional_pages syscall32_setup_pages
extern int sysctl_ldt16;
#endif
/*
@ -381,13 +380,6 @@ static ctl_table abi_table2[] = {
.mode = 0644,
.proc_handler = proc_dointvec
},
{
.procname = "ldt16",
.data = &sysctl_ldt16,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dointvec
},
{}
};