mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Andy Lutomirski <luto@kernel.org>
To: X86 ML <x86@kernel.org>
Cc: Borislav Petkov <bpetkov@suse.de>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	Brian Gerst <brgerst@gmail.com>,
	Dave Hansen <dave.hansen@intel.com>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Josh Poimboeuf <jpoimboe@redhat.com>,
	Andy Lutomirski <luto@kernel.org>
Subject: [PATCH 05/16] x86/asm: Fix assumptions that the HW TSS is at the beginning of cpu_tss
Date: Mon, 20 Nov 2017 09:07:36 -0800	[thread overview]
Message-ID: <d25257ee6d75c388371f17a718cd1d0a8e28ad57.1511195781.git.luto@kernel.org> (raw)
In-Reply-To: <cover.1511195781.git.luto@kernel.org>
In-Reply-To: <cover.1511195781.git.luto@kernel.org>

I'm going to move SYSENTER_stack to the beginning of cpu_tss to help
detect overflow.  Before this can happen, I need to fix several code
paths that hardcode assumptions about the old layout.

Signed-off-by: Andy Lutomirski <luto@kernel.org>
---
 arch/x86/include/asm/desc.h      |  2 +-
 arch/x86/include/asm/processor.h |  4 ++--
 arch/x86/kernel/cpu/common.c     |  8 ++++----
 arch/x86/kernel/doublefault.c    | 36 +++++++++++++++++-------------------
 arch/x86/power/cpu.c             | 13 +++++++------
 5 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
index 194ffab00ebe..aab4fe9f49f8 100644
--- a/arch/x86/include/asm/desc.h
+++ b/arch/x86/include/asm/desc.h
@@ -178,7 +178,7 @@ static inline void set_tssldt_descriptor(void *d, unsigned long addr,
 #endif
 }
 
-static inline void __set_tss_desc(unsigned cpu, unsigned int entry, void *addr)
+static inline void __set_tss_desc(unsigned cpu, unsigned int entry, struct x86_hw_tss *addr)
 {
 	struct desc_struct *d = get_cpu_gdt_rw(cpu);
 	tss_desc tss;
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 789dad5da20f..d32a3c88a968 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -162,7 +162,7 @@ enum cpuid_regs_idx {
 extern struct cpuinfo_x86	boot_cpu_data;
 extern struct cpuinfo_x86	new_cpu_data;
 
-extern struct tss_struct	doublefault_tss;
+extern struct x86_hw_tss	doublefault_tss;
 extern __u32			cpu_caps_cleared[NCAPINTS];
 extern __u32			cpu_caps_set[NCAPINTS];
 
@@ -322,7 +322,7 @@ struct x86_hw_tss {
 #define IO_BITMAP_BITS			65536
 #define IO_BITMAP_BYTES			(IO_BITMAP_BITS/8)
 #define IO_BITMAP_LONGS			(IO_BITMAP_BYTES/sizeof(long))
-#define IO_BITMAP_OFFSET		offsetof(struct tss_struct, io_bitmap)
+#define IO_BITMAP_OFFSET		(offsetof(struct tss_struct, io_bitmap) - offsetof(struct tss_struct, x86_tss))
 #define INVALID_IO_BITMAP_OFFSET	0x8000
 
 struct tss_struct {
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 1e0843d15e64..099fca92f6be 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1580,7 +1580,7 @@ void cpu_init(void)
 		}
 	}
 
-	t->x86_tss.io_bitmap_base = offsetof(struct tss_struct, io_bitmap);
+	t->x86_tss.io_bitmap_base = IO_BITMAP_OFFSET;
 
 	/*
 	 * <= is required because the CPU will access up to
@@ -1599,7 +1599,7 @@ void cpu_init(void)
 	 * Initialize the TSS.  Don't bother initializing sp0, as the initial
 	 * task never enters user mode.
 	 */
-	set_tss_desc(cpu, t);
+	set_tss_desc(cpu, &t->x86_tss);
 	load_TR_desc();
 
 	load_mm_ldt(&init_mm);
@@ -1657,12 +1657,12 @@ void cpu_init(void)
 	 * Initialize the TSS.  Don't bother initializing sp0, as the initial
 	 * task never enters user mode.
 	 */
-	set_tss_desc(cpu, t);
+	set_tss_desc(cpu, &t->x86_tss);
 	load_TR_desc();
 
 	load_mm_ldt(&init_mm);
 
-	t->x86_tss.io_bitmap_base = offsetof(struct tss_struct, io_bitmap);
+	t->x86_tss.io_bitmap_base = IO_BITMAP_OFFSET;
 
 #ifdef CONFIG_DOUBLEFAULT
 	/* Set up doublefault TSS pointer in the GDT */
diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault.c
index 0e662c55ae90..0b8cedb20d6d 100644
--- a/arch/x86/kernel/doublefault.c
+++ b/arch/x86/kernel/doublefault.c
@@ -50,25 +50,23 @@ static void doublefault_fn(void)
 		cpu_relax();
 }
 
-struct tss_struct doublefault_tss __cacheline_aligned = {
-	.x86_tss = {
-		.sp0		= STACK_START,
-		.ss0		= __KERNEL_DS,
-		.ldt		= 0,
-		.io_bitmap_base	= INVALID_IO_BITMAP_OFFSET,
-
-		.ip		= (unsigned long) doublefault_fn,
-		/* 0x2 bit is always set */
-		.flags		= X86_EFLAGS_SF | 0x2,
-		.sp		= STACK_START,
-		.es		= __USER_DS,
-		.cs		= __KERNEL_CS,
-		.ss		= __KERNEL_DS,
-		.ds		= __USER_DS,
-		.fs		= __KERNEL_PERCPU,
-
-		.__cr3		= __pa_nodebug(swapper_pg_dir),
-	}
+struct x86_hw_tss doublefault_tss __cacheline_aligned = {
+	.sp0		= STACK_START,
+	.ss0		= __KERNEL_DS,
+	.ldt		= 0,
+	.io_bitmap_base	= INVALID_IO_BITMAP_OFFSET,
+
+	.ip		= (unsigned long) doublefault_fn,
+	/* 0x2 bit is always set */
+	.flags		= X86_EFLAGS_SF | 0x2,
+	.sp		= STACK_START,
+	.es		= __USER_DS,
+	.cs		= __KERNEL_CS,
+	.ss		= __KERNEL_DS,
+	.ds		= __USER_DS,
+	.fs		= __KERNEL_PERCPU,
+
+	.__cr3		= __pa_nodebug(swapper_pg_dir),
 };
 
 /* dummy for do_double_fault() call */
diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
index 84fcfde53f8f..50593e138281 100644
--- a/arch/x86/power/cpu.c
+++ b/arch/x86/power/cpu.c
@@ -165,12 +165,13 @@ static void fix_processor_context(void)
 	struct desc_struct *desc = get_cpu_gdt_rw(cpu);
 	tss_desc tss;
 #endif
-	set_tss_desc(cpu, t);	/*
-				 * This just modifies memory; should not be
-				 * necessary. But... This is necessary, because
-				 * 386 hardware has concept of busy TSS or some
-				 * similar stupidity.
-				 */
+
+	/*
+	 * This just modifies memory; should not be necessary. But... This is
+	 * necessary, because 386 hardware has concept of busy TSS or some
+	 * similar stupidity.
+	 */
+	set_tss_desc(cpu, &t->x86_tss);
 
 #ifdef CONFIG_X86_64
 	memcpy(&tss, &desc[GDT_ENTRY_TSS], sizeof(tss_desc));
-- 
2.13.6

  parent reply	other threads:[~2017-11-20 17:11 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-20 17:07 [PATCH 00/16] Entry stuff, in decent shape now Andy Lutomirski
2017-11-20 17:07 ` [PATCH 01/16] x86/asm/64: Allocate and enable the SYSENTER stack Andy Lutomirski
2017-11-20 21:55   ` Thomas Gleixner
2017-11-21 10:47   ` Borislav Petkov
2017-11-20 17:07 ` [PATCH 02/16] x86/dumpstack: Add get_stack_info() support for " Andy Lutomirski
2017-11-20 20:42   ` Josh Poimboeuf
2017-11-20 20:46     ` Andy Lutomirski
2017-11-20 21:00       ` Josh Poimboeuf
2017-11-20 21:07         ` Andy Lutomirski
2017-11-20 21:27           ` Josh Poimboeuf
2017-11-20 21:30             ` Andy Lutomirski
2017-11-20 21:55               ` Josh Poimboeuf
2017-11-21  1:39                 ` Andy Lutomirski
2017-11-21  2:29                   ` Josh Poimboeuf
2017-11-20 17:07 ` [PATCH 03/16] x86/gdt: Put per-cpu GDT remaps in ascending order Andy Lutomirski
2017-11-20 21:56   ` Thomas Gleixner
2017-11-21 17:16   ` Borislav Petkov
2017-11-20 17:07 ` [PATCH 04/16] x86/fixmap: Generalize the GDT fixmap mechanism Andy Lutomirski
2017-11-20 22:01   ` Thomas Gleixner
2017-11-21  1:21     ` Andy Lutomirski
2017-11-21  8:29       ` Thomas Gleixner
2017-11-20 17:07 ` Andy Lutomirski [this message]
2017-11-20 22:22   ` [PATCH 05/16] x86/asm: Fix assumptions that the HW TSS is at the beginning of cpu_tss Thomas Gleixner
2017-11-20 17:07 ` [PATCH 06/16] x86/dumpstack: Handle stack overflow on all stacks Andy Lutomirski
2017-11-20 17:07 ` [PATCH 07/16] x86/asm: Move SYSENTER_stack to the beginning of struct tss_struct Andy Lutomirski
2017-11-20 23:37   ` Thomas Gleixner
2017-11-21  1:25     ` Andy Lutomirski
2017-11-20 17:07 ` [PATCH 08/16] x86/asm: Remap the TSS into the cpu entry area Andy Lutomirski
2017-11-20 17:07 ` [PATCH 09/16] x86/asm/64: Separate cpu_current_top_of_stack from TSS.sp0 Andy Lutomirski
2017-11-20 17:07 ` [PATCH 10/16] x86/espfix/64: Stop assuming that pt_regs is on the entry stack Andy Lutomirski
2017-11-20 17:07 ` [PATCH 11/16] x86/asm/64: Use a percpu trampoline stack for IDT entries Andy Lutomirski
2017-11-21  7:20   ` Ingo Molnar
2017-11-21 15:36     ` Andy Lutomirski
2017-11-21 18:57   ` Dave Hansen
2017-11-22  3:45     ` Andy Lutomirski
2017-11-20 17:07 ` [PATCH 12/16] x86/asm/64: Return to userspace from the trampoline stack Andy Lutomirski
2017-11-20 17:07 ` [PATCH 13/16] x86/entry/64: Create a percpu SYSCALL entry trampoline Andy Lutomirski
2017-11-21  2:34   ` Josh Poimboeuf
2017-11-21  3:20     ` Andy Lutomirski
2017-11-20 17:07 ` [PATCH 14/16] x86/irq: Remove an old outdated comment about context tracking races Andy Lutomirski
2017-11-21  6:25   ` Ingo Molnar
2017-11-20 17:07 ` [PATCH 15/16] x86/irq/64: In the stack overflow warning, print the offending IP Andy Lutomirski
2017-11-21  6:26   ` Ingo Molnar
2017-11-20 17:07 ` [PATCH 16/16] x86/entry/64: Move the IST stacks into cpu_entry_area Andy Lutomirski
2017-11-21  7:38   ` Ingo Molnar
2017-11-21 14:45     ` Andrey Ryabinin
2017-11-23 15:25       ` Andy Lutomirski
2017-11-21 15:33     ` Andy Lutomirski
2017-11-20 18:48 ` [PATCH 00/16] Entry stuff, in decent shape now Andy Lutomirski
2017-11-21  7:33 ` Ingo Molnar
2017-11-21 15:59   ` Andy Lutomirski
2017-11-21 16:12     ` Andy Lutomirski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=d25257ee6d75c388371f17a718cd1d0a8e28ad57.1511195781.git.luto@kernel.org \
    --to=luto@kernel.org \
    --cc=bpetkov@suse.de \
    --cc=brgerst@gmail.com \
    --cc=dave.hansen@intel.com \
    --cc=jpoimboe@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®