x86 KASLR changes for v3.10
Subsystems (2)
Linus,
Please pull the latest x86-kaslr-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-kaslr-for-linus
HEAD: c889ba801dc3b3a0155fa77d567f2c3a6097de1c x86, relocs: Refactor the relocs tool to merge 32- and 64-bit ELF
This merge contains changes from the ongoing KASLR work, by Kees Cook.
The main changes are the use of a read-only IDT on x86 (which decouples the userspace visible virtual IDT address from the physical address), and a rework of ELF relocation support, in preparation of random, boot-time kernel image relocation.
Thanks,
Ingo
------------------>
H. Peter Anvin (1):
x86, relocs: Refactor the relocs tool to merge 32- and 64-bit ELF
Kees Cook (5):
x86: Use a read-only IDT alias on all CPUs x86, relocs: Generalize ELF structure names x86, relocs: Consolidate processing logic x86, relocs: Add 64-bit ELF support to relocs tool x86, relocs: Build separate 32/64-bit tools
arch/x86/include/asm/fixmap.h | 4 +- arch/x86/kernel/cpu/intel.c | 18 +- arch/x86/kernel/traps.c | 9 + arch/x86/tools/Makefile | 1 + arch/x86/tools/relocs.c | 783 ++++++++++++++++++++++++++--------------- arch/x86/tools/relocs.h | 36 ++ arch/x86/tools/relocs_32.c | 17 + arch/x86/tools/relocs_64.c | 17 + arch/x86/tools/relocs_common.c | 76 ++++ arch/x86/xen/mmu.c | 4 +- 10 files changed, 660 insertions(+), 305 deletions(-) create mode 100644 arch/x86/tools/relocs.h create mode 100644 arch/x86/tools/relocs_32.c create mode 100644 arch/x86/tools/relocs_64.c create mode 100644 arch/x86/tools/relocs_common.c
arch/x86/include/asm/fixmap.h +1 -3
@@ -104,9 +104,7 @@ enum fixed_addresses {FIX_LI_PCIA ,/* Lithium PCI Bridge A */ FIX_LI_PCIB ,/* Lithium PCI Bridge B */ #endif -#ifdef CONFIG_X86_F00F_BUG - FIX_F00F_IDT, /* Virtual mapping for IDT */ -#endif +FIX_RO_IDT ,/* Virtual mapping for read-only IDT */ #ifdef CONFIG_X86_CYCLONE_TIMER FIX_CYCLONE_TIMER, /*cyclone timer register*/ #endif
arch/x86/kernel/cpu/intel.c +1 -17
@@ -164,20 +164,6 @@ int __cpuinit ppro_with_ram_bug(void)return 0 ; } -#ifdef CONFIG_X86_F00F_BUG -static void __cpuinit trap_init_f00f_bug (void ) -{ -__set_fixmap (FIX_F00F_IDT ,__pa_symbol (idt_table),PAGE_KERNEL_RO ); - -/* -* Update the IDT descriptor and reload the IDT so that -* it uses the read-only mapped virtual address. -*/ - idt_descr.address =fix_to_virt (FIX_F00F_IDT ); -load_idt (&idt_descr); -} -#endif -static void __cpuinit intel_smp_check (struct cpuinfo_x86 *c) {/* calling is from identify_secondary_cpu() ? */
@@ -206,8 +192,7 @@ static void __cpuinit intel_workarounds(struct cpuinfo_x86 *c)/* * All current models of Pentium and Pentium with MMX technology CPUs * have the F0 0F bug, which lets nonprivileged users lock up the -* system. -* Note that the workaround only should be initialized once... +* system. Announce that the fault handler will be checking for it. */ c->f00f_bug =0 ;if (!paravirt_enabled () && c->x86 ==5 ) {
@@ -215,7 +200,6 @@ static void __cpuinit intel_workarounds(struct cpuinfo_x86 *c) c->f00f_bug =1 ;if (!f00f_workaround_enabled) { -trap_init_f00f_bug ();printk (KERN_NOTICE "Intel Pentium with F0 0F bug - workaround enabled.\n" ); f00f_workaround_enabled =1 ; }
arch/x86/kernel/traps.c +9 -0
@@ -56,6 +56,7 @@#include <asm/fpu-internal.h> #include <asm/mce.h> #include <asm/context_tracking.h> +#include <asm/fixmap.h> #include <asm/mach_traps.h>
@@ -753,6 +754,14 @@ void __init trap_init(void)#endif /* +* Set the IDT descriptor to a fixed read-only location, so that the +* "sidt" instruction will not leak the location of the kernel, and +* to defend the IDT against arbitrary memory write vulnerabilities. +* It will be reloaded in cpu_init() */ +__set_fixmap (FIX_RO_IDT ,__pa_symbol (idt_table),PAGE_KERNEL_RO ); + idt_descr.address =fix_to_virt (FIX_RO_IDT ); + +/* * Should be a barrier for any external CPU state: */ cpu_init ();
arch/x86/tools/Makefile +1 -0
@@ -39,4 +39,5 @@ $(obj)/insn_sanity.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/ina HOST_EXTRACFLAGS += -I$(srctree)/tools/include hostprogs-y += relocs +relocs-objs := relocs_32.o relocs_64.o relocs_common.o relocs: $(obj)/relocs
arch/x86/tools/relocs.c +501 -282
1,035 lines not on this page · raw message
arch/x86/tools/relocs.h new file +36 -0
@@ -0,0 +1,36 @@ +#ifndef RELOCS_H +#define RELOCS_H + +#include <stdio.h> +#include <stdarg.h> +#include <stdlib.h> +#include <stdint.h> +#include <inttypes.h> +#include <string.h> +#include <errno.h> +#include <unistd.h> +#include <elf.h> +#include <byteswap.h> +#define USE_BSD +#include <endian.h> +#include <regex.h> +#include <tools/le_byteshift.h> + +void die (char *fmt, ...); + +#define ARRAY_SIZE (x) (sizeof(x) / sizeof((x)[0])) + +enum symtype { +S_ABS , +S_REL , +S_SEG , +S_LIN , +S_NSYMTYPES +}; + +void process_32 (FILE *fp,int use_real_mode,int as_text, +int show_absolute_syms,int show_absolute_relocs); +void process_64 (FILE *fp,int use_real_mode,int as_text, +int show_absolute_syms,int show_absolute_relocs); + +#endif /* RELOCS_H */
arch/x86/tools/relocs_32.c new file +17 -0
@@ -0,0 +1,17 @@ +#include "relocs.h" + +#define ELF_BITS 32 + +#define ELF_MACHINE EM_386 +#define ELF_MACHINE_NAME "i386" +#define SHT_REL_TYPE SHT_REL +#define Elf_Rel ElfW(Rel) + +#define ELF_CLASS ELFCLASS32 +#define ELF_R_SYM (val) ELF32_R_SYM(val) +#define ELF_R_TYPE (val) ELF32_R_TYPE(val) +#define ELF_ST_TYPE (o) ELF32_ST_TYPE(o) +#define ELF_ST_BIND (o) ELF32_ST_BIND(o) +#define ELF_ST_VISIBILITY (o) ELF32_ST_VISIBILITY(o) + +#include "relocs.c"
arch/x86/tools/relocs_64.c new file +17 -0
@@ -0,0 +1,17 @@ +#include "relocs.h" + +#define ELF_BITS 64 + +#define ELF_MACHINE EM_X86_64 +#define ELF_MACHINE_NAME "x86_64" +#define SHT_REL_TYPE SHT_RELA +#define Elf_Rel Elf64_Rela + +#define ELF_CLASS ELFCLASS64 +#define ELF_R_SYM (val) ELF64_R_SYM(val) +#define ELF_R_TYPE (val) ELF64_R_TYPE(val) +#define ELF_ST_TYPE (o) ELF64_ST_TYPE(o) +#define ELF_ST_BIND (o) ELF64_ST_BIND(o) +#define ELF_ST_VISIBILITY (o) ELF64_ST_VISIBILITY(o) + +#include "relocs.c"
arch/x86/tools/relocs_common.c new file +76 -0
76 lines not on this page · raw message
arch/x86/xen/mmu.c +1 -3
@@ -2039,9 +2039,7 @@ static void xen_set_fixmap(unsigned idx, phys_addr_t phys, pgprot_t prot)switch (idx) { case FIX_BTMAP_END ... FIX_BTMAP_BEGIN: -#ifdef CONFIG_X86_F00F_BUG -case FIX_F00F_IDT : -#endif +case FIX_RO_IDT :#ifdef CONFIG_X86_32 case FIX_WP_TEST :case FIX_VDSO :