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

This reverts commit fa81511bb0 in
preparation of merging in the proper fix (espfix64).

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
此提交包含在:
H. Peter Anvin
2014-05-21 10:22:59 -07:00
父節點 172de656b9
當前提交 7ed6fb9b5a
共有 2 個檔案被更改,包括 1 行新增11 行删除

查看文件

@@ -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;
}