Merge branch 'x86-security-for-linus' of...
Merge branch 'x86-security-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-security-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: module: Move RO/NX module protection to after ftrace module update x86: Resume trampoline must be executable x86: Add RO/NX protection for loadable kernel modules x86: Add NX protection for kernel data x86: Fix improper large page preservation
Showing
- arch/x86/Kconfig.debug 11 additions, 0 deletionsarch/x86/Kconfig.debug
- arch/x86/include/asm/pci.h 1 addition, 0 deletionsarch/x86/include/asm/pci.h
- arch/x86/kernel/ftrace.c 3 additions, 0 deletionsarch/x86/kernel/ftrace.c
- arch/x86/kernel/vmlinux.lds.S 6 additions, 2 deletionsarch/x86/kernel/vmlinux.lds.S
- arch/x86/mm/init.c 2 additions, 1 deletionarch/x86/mm/init.c
- arch/x86/mm/init_32.c 19 additions, 1 deletionarch/x86/mm/init_32.c
- arch/x86/mm/pageattr.c 22 additions, 11 deletionsarch/x86/mm/pageattr.c
- arch/x86/pci/pcbios.c 23 additions, 0 deletionsarch/x86/pci/pcbios.c
- include/linux/module.h 10 additions, 1 deletioninclude/linux/module.h
- kernel/module.c 169 additions, 2 deletionskernel/module.c
Loading
Please register or sign in to comment