Patch "x86/ldt: Make modify_ldt synchronous" has been added to the 4.1-stable tree
Subsystems (4)
This is a note to let you know that I've just added the patch titled
x86/ldt: Make modify_ldt synchronous
to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
x86-ldt-make-modify_ldt-synchronous.patch
and it can be found in the queue-4.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
37868fe113ff2ba814b3b4eb12df214df555f8dcMon Sep 17 00:00:00 2001
From: Andy Lutomirski <[email protected]>
Date: Thu, 30 Jul 2015 14:31:32 -0700
Subject: x86/ldt: Make modify_ldt synchronous
From: Andy Lutomirski <[email protected]>
commit 37868fe113ff2ba814b3b4eb12df214df555f8dc upstream.
modify_ldt() has questionable locking and does not synchronize threads. Improve it: redesign the locking and synchronize all threads' LDTs using an IPI on all modifications.
This will dramatically slow down modify_ldt in multithreaded programs, but there shouldn't be any multithreaded programs that care about modify_ldt's performance in the first place.
This fixes some fallout from the CVE-2015-5157 fixes.
--- arch/x86/include/asm/desc.h | 15 -- arch/x86/include/asm/mmu.h | 3 arch/x86/include/asm/mmu_context.h | 54 ++++++- arch/x86/kernel/cpu/common.c | 4 arch/x86/kernel/cpu/perf_event.c | 12 + arch/x86/kernel/ldt.c | 264 ++++++++++++++++++++----------------- arch/x86/kernel/process_64.c | 4 arch/x86/kernel/step.c | 6 arch/x86/power/cpu.c | 3 9 files changed, 211 insertions(+), 154 deletions(-)
arch/x86/include/asm/desc.h +0 -15
@@ -280,21 +280,6 @@ static inline void clear_LDT(void)set_ldt (NULL ,0 ); } -/* -* load one particular LDT into the current CPU -*/ -static inline void load_LDT_nolock (mm_context_t *pc) -{ -set_ldt (pc->ldt, pc->size); -} - -static inline void load_LDT (mm_context_t *pc) -{ -preempt_disable (); -load_LDT_nolock (pc); -preempt_enable (); -} -static inline unsigned long get_desc_base (const struct desc_struct *desc) {return (unsigned )(desc->base0 | ((desc->base1) <<16 ) | ((desc->base2) <<24 ));
arch/x86/include/asm/mmu.h +1 -2
@@ -9,8 +9,7 @@* we put the segment information here. */ typedef struct { - void *ldt; - int size; + struct ldt_struct *ldt; #ifdef CONFIG_X86_64 /* True if mm supports a task running in 32 bit compatibility mode. */
arch/x86/include/asm/mmu_context.h +49 -5
74 lines not on this page · raw message
arch/x86/kernel/cpu/common.c +2 -2
@@ -1434,7 +1434,7 @@ void cpu_init(void)load_sp0 (t, ¤t->thread);set_tss_desc (cpu, t);load_TR_desc (); -load_LDT (&init_mm.context); +load_mm_ldt (&init_mm);clear_all_debug_regs ();dbg_restore_debug_regs ();
@@ -1483,7 +1483,7 @@ void cpu_init(void)load_sp0 (t, thread);set_tss_desc (cpu, t);load_TR_desc (); -load_LDT (&init_mm.context); +load_mm_ldt (&init_mm); t->x86_tss.io_bitmap_base = offsetof(struct tss_struct , io_bitmap);
arch/x86/kernel/cpu/perf_event.c +8 -4
@@ -2170,21 +2170,25 @@ static unsigned long get_segment_base(unint idx = segment >>3 ;if ((segment &SEGMENT_TI_MASK ) ==SEGMENT_LDT ) { +struct ldt_struct *ldt; +if (idx >LDT_ENTRIES )return 0 ; -if (idx > current->active_mm->context.size) +/* IRQs are off, so this synchronizes with smp_store_release */ + ldt =lockless_dereference (current->active_mm->context.ldt); +if (!ldt || idx > ldt->size)return 0 ; - desc = current->active_mm->context.ldt; + desc = &ldt->entries[idx]; }else {if (idx >GDT_ENTRIES )return 0 ; - desc =raw_cpu_ptr (gdt_page.gdt); + desc =raw_cpu_ptr (gdt_page.gdt) + idx; } -return get_desc_base (desc + idx); +return get_desc_base (desc); }#ifdef CONFIG_COMPAT
arch/x86/kernel/ldt.c +143 -121
341 lines not on this page · raw message
arch/x86/kernel/process_64.c +2 -2
@@ -122,11 +122,11 @@ void __show_regs(struct pt_regs *regs, ivoid release_thread (struct task_struct *dead_task) {if (dead_task->mm) { -if (dead_task->mm->context.size) { +if (dead_task->mm->context.ldt) {pr_warn ("WARNING: dead process %s still has LDT? <%p/%d>\n" , dead_task->comm, dead_task->mm->context.ldt, - dead_task->mm->context.size); + dead_task->mm->context.ldt->size);BUG (); } }
arch/x86/kernel/step.c +4 -2
@@ -5,6 +5,7 @@#include <linux/mm.h> #include <linux/ptrace.h> #include <asm/desc.h> +#include <asm/mmu_context.h> unsigned long convert_ip_to_linear (struct task_struct *child,struct pt_regs *regs) {
@@ -30,10 +31,11 @@ unsigned long convert_ip_to_linear(struc seg &= ~7UL ;mutex_lock (&child->mm->context.lock); -if (unlikely ((seg >>3 ) >= child->mm->context.size)) +if (unlikely (!child->mm->context.ldt || + (seg >>3 ) >= child->mm->context.ldt->size)) addr =-1L ;/* bogus selector, access would fault */ else { - desc = child->mm->context.ldt + seg; + desc = &child->mm->context.ldt->entries[seg]; base =get_desc_base (desc);/* 16-bit code segment? */
arch/x86/power/cpu.c +2 -1
@@ -23,6 +23,7 @@#include <asm/debugreg.h> #include <asm/fpu-internal.h> /* pcntxt_mask */ #include <asm/cpu.h> +#include <asm/mmu_context.h> #ifdef CONFIG_X86_32 __visible unsigned long saved_context_ebx;
@@ -154,7 +155,7 @@ static void fix_processor_context(void)syscall_init ();/* This sets MSR_*STAR and related */ #endif load_TR_desc ();/* This does ltr */ -load_LDT (¤t->active_mm->context);/* This does lldt */ +load_mm_ldt (current->active_mm);/* This does lldt */ }/**
Patches currently in stable-queue which might be from [email protected] are
queue-4.1/x86-nmi-enable-nested-do_nmi-handling-for-64-bit-kernels.patch queue-4.1/x86-nmi-64-switch-stacks-on-userspace-nmi-entry.patch queue-4.1/x86-nmi-64-remove-asm-code-that-saves-cr2.patch queue-4.1/x86-nmi-64-use-df-to-avoid-userspace-rsp-confusing-nested-nmi-detection.patch queue-4.1/x86-asm-entry-64-remove-pointless-jump-to-irq_return.patch queue-4.1/x86-xen-probe-target-addresses-in-set_aliased_prot-before-the-hypercall.patch queue-4.1/x86-nmi-64-reorder-nested-nmi-checks.patch queue-4.1/x86-ldt-make-modify_ldt-synchronous.patch queue-4.1/x86-nmi-64-improve-nested-nmi-comments.patch
Quoted 4 lines · On Thu, Aug 13, 2015 at 5:44 PM, <[email protected]> wrote:
This is a note to let you know that I've just added the patch titled
x86/ldt: Make
modify_ldtsynchronous
This needs:
and its parent. :(
--Andy
Quoted 4 lines · On Thu, Aug 13, 2015 at 5:44 PM, <[email protected]> wrote:
This is a note to let you know that I've just added the patch titled
x86/ldt: Make
modify_ldtsynchronous
This needs:
and its parent. :(
--Andy
Greg KH
maintainerQuoted 11 lines · Andy Lutomirski
Quoted 4 lines · On Thu, Aug 13, 2015 at 5:44 PM, <[email protected]> wrote:
This is a note to let you know that I've just added the patch titled
x86/ldt: Make
modify_ldtsynchronousThis needs:
and its parent. :(
As that isn't in Linus's tree yet, I'll move this one back and wait a release or so before it gets merged.
thanks,
greg k-h
Greg KH
maintainerQuoted 11 lines · Andy Lutomirski
Quoted 4 lines · On Thu, Aug 13, 2015 at 5:44 PM, <[email protected]> wrote:
This is a note to let you know that I've just added the patch titled
x86/ldt: Make
modify_ldtsynchronousThis needs:
and its parent. :(
As that isn't in Linus's tree yet, I'll move this one back and wait a release or so before it gets merged.
thanks,
greg k-h
Quoted 7 lines · Greg KH
Quoted 6 lines · Andy Lutomirski
Quoted 4 lines · On Thu, Aug 13, 2015 at 5:44 PM, <[email protected]> wrote:
This is a note to let you know that I've just added the patch titled
x86/ldt: Make
modify_ldtsynchronous
Quoted 8 lines
Quoted 5 lines
This needs:
and its parent. :(
As that isn't in Linus's tree yet, I'll move this one back and wait a release or so before it gets merged.
I just sent it to Linus, so barring a catastrophy it should be upstream soon.
Thanks,
Ingo
Quoted 7 lines · Greg KH
Quoted 6 lines · Andy Lutomirski
Quoted 4 lines · On Thu, Aug 13, 2015 at 5:44 PM, <[email protected]> wrote:
This is a note to let you know that I've just added the patch titled
x86/ldt: Make
modify_ldtsynchronous
Quoted 8 lines
Quoted 5 lines
This needs:
and its parent. :(
As that isn't in Linus's tree yet, I'll move this one back and wait a release or so before it gets merged.
I just sent it to Linus, so barring a catastrophy it should be upstream soon.
Thanks,
Ingo
Quoted 2 lines · Ingo Molnar
I just sent it to Linus, so barring a catastrophy it should be upstream soon.
Well, I just rejected that pull as completely broken, so I guess the catastrophy happened... Or, alternatively, I mis-read the code, which does happen, but my giant ego tells me that's very rare..
Linus
Quoted 2 lines · Ingo Molnar
I just sent it to Linus, so barring a catastrophy it should be upstream soon.
Well, I just rejected that pull as completely broken, so I guess the catastrophy happened... Or, alternatively, I mis-read the code, which does happen, but my giant ego tells me that's very rare..
Linus