diff options
| author | Andy Lutomirski <luto@kernel.org> | 2015-08-14 15:02:55 -0700 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-08-25 16:57:02 +0200 |
| commit | 6afc9ab280ef4a201ad352909c474a52ca1918f8 (patch) | |
| tree | b8189f6fc1ff0a6ac3b1acba67fd684f1ac4e56d | |
| parent | 542402ab2dc75fe8bfa8db5532067ecc3982da39 (diff) | |
x86/ldt: Further fix FPU emulation
commit 12e244f4b550498bbaf654a52f93633f7dde2dc7 upstream.
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>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | arch/x86/math-emu/get_address.c | 2 |
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 |