Commit 3f93d4d4 authored by Juergen Gross's avatar Juergen Gross Committed by Luis Henriques

x86/ldt: Correct FPU emulation access to LDT

commit 4809146b upstream.

Commit 37868fe1 ("x86/ldt: Make modify_ldt synchronous")
introduced a new struct ldt_struct anchored at mm->context.ldt.

Adapt the x86 fpu emulation code to use that new structure.
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Reviewed-by: default avatarAndy Lutomirski <luto@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: billm@melbpc.org.au
Link: http://lkml.kernel.org/r/1438883674-1240-1-git-send-email-jgross@suse.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 49070961
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/traps.h> #include <asm/traps.h>
#include <asm/desc.h>
#include <asm/user.h> #include <asm/user.h>
#include <asm/i387.h> #include <asm/i387.h>
...@@ -185,7 +184,7 @@ void math_emulate(struct math_emu_info *info) ...@@ -185,7 +184,7 @@ void math_emulate(struct math_emu_info *info)
math_abort(FPU_info, SIGILL); math_abort(FPU_info, SIGILL);
} }
code_descriptor = LDT_DESCRIPTOR(FPU_CS); code_descriptor = FPU_get_ldt_descriptor(FPU_CS);
if (SEG_D_SIZE(code_descriptor)) { if (SEG_D_SIZE(code_descriptor)) {
/* The above test may be wrong, the book is not clear */ /* The above test may be wrong, the book is not clear */
/* Segmented 32 bit protected mode */ /* Segmented 32 bit protected mode */
......
...@@ -16,9 +16,24 @@ ...@@ -16,9 +16,24 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mm.h> #include <linux/mm.h>
/* s is always from a cpu register, and the cpu does bounds checking #include <asm/desc.h>
* during register load --> no further bounds checks needed */ #include <asm/mmu_context.h>
#define LDT_DESCRIPTOR(s) (((struct desc_struct *)current->mm->context.ldt)[(s) >> 3])
static inline struct desc_struct FPU_get_ldt_descriptor(unsigned seg)
{
static struct desc_struct zero_desc;
struct desc_struct ret = zero_desc;
#ifdef CONFIG_MODIFY_LDT_SYSCALL
seg >>= 3;
mutex_lock(&current->mm->context.lock);
if (current->mm->context.ldt && seg < current->mm->context.ldt->size)
ret = current->mm->context.ldt->entries[seg];
mutex_unlock(&current->mm->context.lock);
#endif
return ret;
}
#define SEG_D_SIZE(x) ((x).b & (3 << 21)) #define SEG_D_SIZE(x) ((x).b & (3 << 21))
#define SEG_G_BIT(x) ((x).b & (1 << 23)) #define SEG_G_BIT(x) ((x).b & (1 << 23))
#define SEG_GRANULARITY(x) (((x).b & (1 << 23)) ? 4096 : 1) #define SEG_GRANULARITY(x) (((x).b & (1 << 23)) ? 4096 : 1)
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <linux/stddef.h> #include <linux/stddef.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/desc.h>
#include "fpu_system.h" #include "fpu_system.h"
#include "exception.h" #include "exception.h"
...@@ -158,7 +157,7 @@ static long pm_address(u_char FPU_modrm, u_char segment, ...@@ -158,7 +157,7 @@ static long pm_address(u_char FPU_modrm, u_char segment,
addr->selector = PM_REG_(segment); addr->selector = PM_REG_(segment);
} }
descriptor = LDT_DESCRIPTOR(PM_REG_(segment)); descriptor = FPU_get_ldt_descriptor(segment);
base_address = SEG_BASE_ADDR(descriptor); base_address = SEG_BASE_ADDR(descriptor);
address = base_address + offset; address = base_address + offset;
limit = base_address limit = base_address
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment