summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAndy Lutomirski <luto@kernel.org>2015-08-15 01:02:55 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-08-17 01:11:05 +0300
commit12e244f4b550498bbaf654a52f93633f7dde2dc7 (patch)
treeefea08716a5a23ee317608ecc3efacf8bfb073bb /arch
parent4809146b86c3d41ce588fdb767d021e2a80600dd (diff)
downloadlinux-12e244f4b550498bbaf654a52f93633f7dde2dc7.tar.xz
x86/ldt: Further fix FPU emulation
The previous fix confused a selector with a segment prefix. Fix it. Compile-tested only. Cc: stable@vger.kernel.org Cc: Juergen Gross <jgross@suse.com> Reported-by: Linus Torvalds <torvalds@linux-foundation.org> Fixes: 4809146b86c3 ("x86/ldt: Correct FPU emulation access to LDT") Signed-off-by: Andy Lutomirski <luto@kernel.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/math-emu/get_address.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/math-emu/get_address.c b/arch/x86/math-emu/get_address.c
index d13cab2aec45..8300db71c2a6 100644
--- a/arch/x86/math-emu/get_address.c
+++ b/arch/x86/math-emu/get_address.c
@@ -157,7 +157,7 @@ static long pm_address(u_char FPU_modrm, u_char segment,
addr->selector = PM_REG_(segment);
}
- descriptor = FPU_get_ldt_descriptor(segment);
+ descriptor = FPU_get_ldt_descriptor(addr->selector);
base_address = SEG_BASE_ADDR(descriptor);
address = base_address + offset;
limit = base_address