On Fri, Jul 12, 2013 at 8:21 PM, tip-bot for Kees Cook <tip...@zytor.com> wrote: > Commit-ID: c0b3450f101523a49823fa93d155f1d258e5ac6f > Gitweb: http://git.kernel.org/tip/c0b3450f101523a49823fa93d155f1d258e5ac6f > Author: Kees Cook <keesc...@chromium.org> > AuthorDate: Fri, 12 Jul 2013 15:50:17 -0700 > Committer: H. Peter Anvin <h...@linux.intel.com> > CommitDate: Fri, 12 Jul 2013 16:14:08 -0700 > > x86: Make sure IDT is page aligned > > Since the IDT is referenced from a fixmap, make sure it is page aligned. > Merge with 32-bit one, since it was already aligned to deal with F00F bug. > This avoids the risk of it ever being moved in the bss and having the > mapping be offset, resulting in calling incorrect handlers. > > [ hpa: It isn't clear that this is a manifest bug in any way, but > tagging for -stable because it shouldn't hurt and might avoid some > very hard-to-debug breakages due to unrelated changes. ] > > Signed-off-by: Kees Cook <keesc...@chromium.org> > Link: http://lkml.kernel.org/r/20130712225017.ga5...@www.outflux.net > Reported-by: PaX Team <pagee...@gmail.com> > Cc: sta...@vger.kernel.org > Signed-off-by: H. Peter Anvin <h...@linux.intel.com> > --- > arch/x86/kernel/head_64.S | 4 ---- > arch/x86/kernel/traps.c | 7 ++----- > 2 files changed, 2 insertions(+), 9 deletions(-) > > diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S > index 5e4d8a8..317b8cc 100644 > --- a/arch/x86/kernel/head_64.S > +++ b/arch/x86/kernel/head_64.S > @@ -514,10 +514,6 @@ ENTRY(phys_base) > > .section .bss, "aw", @nobits > .align L1_CACHE_BYTES > -ENTRY(idt_table) > - .skip IDT_ENTRIES * 16 > - > - .align L1_CACHE_BYTES > ENTRY(debug_idt_table) > .skip IDT_ENTRIES * 16 > > diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c > index b0865e8..0952614 100644 > --- a/arch/x86/kernel/traps.c > +++ b/arch/x86/kernel/traps.c > @@ -68,13 +68,10 @@ > #include <asm/setup.h> > > asmlinkage int system_call(void); > +#endif > > -/* > - * The IDT has to be page-aligned to simplify the Pentium > - * F0 0F bug workaround. > - */ > +/* The IDT has to be page-aligned to keep it aligned with its fixmap. */ > gate_desc idt_table[NR_VECTORS] __page_aligned_data = { { { { 0, 0 } } }, }; > -#endif > > DECLARE_BITMAP(used_vectors, NR_VECTORS); > EXPORT_SYMBOL_GPL(used_vectors);
arch/x86/kernel/traps.c:74:1: warning: braces around scalar initializer [enabled by default] arch/x86/kernel/traps.c:74:1: warning: (near initialization for ‘idt_table[0].offset_low’) [enabled by default] arch/x86/kernel/traps.c:74:1: warning: braces around scalar initializer [enabled by default] arch/x86/kernel/traps.c:74:1: warning: (near initialization for ‘idt_table[0].offset_low’) [enabled by default] arch/x86/kernel/traps.c:74:1: warning: excess elements in scalar initializer [enabled by default] arch/x86/kernel/traps.c:74:1: warning: (near initialization for ‘idt_table[0].offset_low’) [enabled by default] -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
