Commit 9584d98b authored by Andy Lutomirski's avatar Andy Lutomirski Committed by Ingo Molnar

x86/fsgsbase/64: Report FSBASE and GSBASE correctly in core dumps

In ELF_COPY_CORE_REGS, we're copying from the current task, so
accessing thread.fsbase and thread.gsbase makes no sense.  Just read
the values from the CPU registers.

In practice, the old code would have been correct most of the time
simply because thread.fsbase and thread.gsbase usually matched the
CPU registers.
Signed-off-by: default avatarAndy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Borislav Petkov <bpetkov@suse.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Chang Seok <chang.seok.bae@intel.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 767d035d
...@@ -204,6 +204,7 @@ void set_personality_ia32(bool); ...@@ -204,6 +204,7 @@ void set_personality_ia32(bool);
#define ELF_CORE_COPY_REGS(pr_reg, regs) \ #define ELF_CORE_COPY_REGS(pr_reg, regs) \
do { \ do { \
unsigned long base; \
unsigned v; \ unsigned v; \
(pr_reg)[0] = (regs)->r15; \ (pr_reg)[0] = (regs)->r15; \
(pr_reg)[1] = (regs)->r14; \ (pr_reg)[1] = (regs)->r14; \
...@@ -226,8 +227,8 @@ do { \ ...@@ -226,8 +227,8 @@ do { \
(pr_reg)[18] = (regs)->flags; \ (pr_reg)[18] = (regs)->flags; \
(pr_reg)[19] = (regs)->sp; \ (pr_reg)[19] = (regs)->sp; \
(pr_reg)[20] = (regs)->ss; \ (pr_reg)[20] = (regs)->ss; \
(pr_reg)[21] = current->thread.fsbase; \ rdmsrl(MSR_FS_BASE, base); (pr_reg)[21] = base; \
(pr_reg)[22] = current->thread.gsbase; \ rdmsrl(MSR_KERNEL_GS_BASE, base); (pr_reg)[22] = base; \
asm("movl %%ds,%0" : "=r" (v)); (pr_reg)[23] = v; \ asm("movl %%ds,%0" : "=r" (v)); (pr_reg)[23] = v; \
asm("movl %%es,%0" : "=r" (v)); (pr_reg)[24] = v; \ asm("movl %%es,%0" : "=r" (v)); (pr_reg)[24] = v; \
asm("movl %%fs,%0" : "=r" (v)); (pr_reg)[25] = v; \ asm("movl %%fs,%0" : "=r" (v)); (pr_reg)[25] = v; \
......
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