lkml.org 
[lkml]   [2014]   [Aug]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 019/104] Revert "x86-64, modify_ldt: Make support for 16-bit segments a runtime option"
    Date
    From: "H. Peter Anvin" <hpa@zytor.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    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: Jiri Slaby <jslaby@suse.cz>
    ---
    arch/x86/kernel/ldt.c | 4 +---
    arch/x86/vdso/vdso32-setup.c | 8 --------
    2 files changed, 1 insertion(+), 11 deletions(-)

    diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
    index dcbbaa165bde..af1d14a9ebda 100644
    --- a/arch/x86/kernel/ldt.c
    +++ b/arch/x86/kernel/ldt.c
    @@ -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;
    }
    diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
    index f1d633a43f8e..d6bfb876cfb0 100644
    --- a/arch/x86/vdso/vdso32-setup.c
    +++ b/arch/x86/vdso/vdso32-setup.c
    @@ -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 struct ctl_table abi_table2[] = {
    .mode = 0644,
    .proc_handler = proc_dointvec
    },
    - {
    - .procname = "ldt16",
    - .data = &sysctl_ldt16,
    - .maxlen = sizeof(int),
    - .mode = 0644,
    - .proc_handler = proc_dointvec
    - },
    {}
    };

    --
    2.0.4


    \
     
     \ /
      Last update: 2014-08-20 14:21    [W:7.545 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site