Linus Torvalds
d09e356ad0
Merge branch 'mm-readonly-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip ...
Pull read-only kernel memory updates from Ingo Molnar:
"This tree adds two (security related) enhancements to the kernel's
handling of read-only kernel memory:
- extend read-only kernel memory to a new class of formerly writable
kernel data: 'post-init read-only memory' via the __ro_after_init
attribute, and mark the ARM and x86 vDSO as such read-only memory.
This kind of attribute can be used for data that requires a once
per bootup initialization sequence, but is otherwise never modified
after that point.
This feature was based on the work by PaX Team and Brad Spengler.
(by Kees Cook, the ARM vDSO bits by David Brown.)
- make CONFIG_DEBUG_RODATA always enabled on x86 and remove the
Kconfig option. This simplifies the kernel and also signals that
read-only memory is the default model and a first-class citizen.
(Kees Cook)"
* 'mm-readonly-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
ARM/vdso: Mark the vDSO code read-only after init
x86/vdso: Mark the vDSO code read-only after init
lkdtm: Verify that '__ro_after_init' works correctly
arch: Introduce post-init read-only memory
x86/mm: Always enable CONFIG_DEBUG_RODATA and remove the Kconfig option
mm/init: Add 'rodata=off' boot cmdline parameter to disable read-only kernel mappings
asm-generic: Consolidate mark_rodata_ro()
2016-03-14 16:58:50 -07:00
move count_zeroes.h out of asm-generic
2015-10-15 00:21:07 +02:00
mm, asm-generic: define PUD_SHIFT in <asm-generic/4level-fixup.h>
2015-02-11 17:06:03 -08:00
asm-generic: Add common asm-offsets.h
2015-06-23 13:35:49 +09:00
atomic: remove all traces of READ_ONCE_CTRL() and atomic*_read_ctrl()
2015-11-03 17:22:17 -08:00
atomic, arch: Audit atomic_{read,set}()
2015-09-23 09:54:28 +02:00
atomic: Provide atomic_{or,xor,and}
2015-07-27 14:06:24 +02:00
audit: Modify a set of system calls in audit class definitions
2014-01-17 17:01:46 -05:00
audit: Modify a set of system calls in audit class definitions
2014-01-17 17:01:46 -05:00
asm-generic: implement virt_xxx memory barriers
2016-01-12 20:46:59 +02:00
arch: Prepare for smp_mb__{before,after}_atomic()
2014-04-18 11:40:30 +02:00
bug: Make BUG() always stop the machine
2014-04-07 16:36:10 -07:00
asm-generic: COMMON_CLK defines __clk_{get,put}
2014-09-25 18:00:45 -07:00
LLVMLinux: Remove warning about returning an uninitialized variable
2014-04-09 13:44:35 -07:00
asm-generic: cmpxchg: avoid warnings from macro-ized cmpxchg() implementations
2015-10-15 00:21:13 +02:00
sched, time: Fix build error with 64 bit cputime_t on 32 bit systems
2014-10-03 05:46:55 +02:00
cputime: Prevent 32bit overflow in time[val|spec]_to_cputime()
2016-02-02 15:24:38 +01:00
__div64_32(): make it overridable at compile time
2015-11-16 14:42:12 -05:00
asm-generic: Add dma-contiguous.h
2014-09-22 13:35:51 +02:00
Merge branch 'akpm' (patches from Andrew)
2015-09-08 17:52:23 -07:00
mm: provide early_memremap_ro to establish read-only mapping
2015-08-20 12:24:22 +01:00
sched/preempt, futex: Disable preemption in UP futex_atomic_cmpxchg_inatomic() explicitly
2015-05-19 08:39:16 +02:00
gpio: remove gpiod_sysfs_set_active_low
2015-05-12 10:46:53 +02:00
mm: Fix generic hugetlb pte check return type.
2013-10-02 20:02:35 -04:00
asm-generic: temporarily add back asm-generic/io-64-nonatomic*.h
2015-10-16 12:08:53 +02:00
asm-generic: temporarily add back asm-generic/io-64-nonatomic*.h
2015-10-16 12:08:53 +02:00
x86/mm, asm-generic: Add IOMMU ioremap_uc() variant default
2015-07-21 10:47:03 +02:00
include/asm-generic/ioctl.h: fix _IOC_TYPECHECK sparse error
2014-06-06 16:08:13 -07:00
x86/mm, asm-generic: Add ioremap_wt() for creating Write-Through mappings
2015-06-07 15:28:56 +02:00
irq_work: Introduce arch_irq_work_has_interrupt()
2014-09-13 18:38:07 +02:00
locking/mcs: Allow architecture specific asm files to be used for contended case
2014-02-09 21:18:52 +01:00
mm: add PHYS_PFN, use it in __phys_to_pfn()
2016-01-14 16:00:49 -08:00
mm: clean up per architecture MM hook header files
2015-07-17 16:39:53 -07:00
mm: Make arch_unmap()/bprm_mm_init() available to all architectures
2014-11-19 11:54:13 +01:00
asm-generic: Remove asm-generic arch_bprm_mm_init()
2014-11-22 21:52:08 +01:00
asm-generic: Add msi.h
2014-11-23 13:01:47 +01:00
locking/mutex: Use acquire/release semantics
2015-10-06 17:28:20 +02:00
locking/mutex: Use acquire/release semantics
2015-10-06 17:28:20 +02:00
pci: remove pci_dma_supported
2015-11-10 16:32:11 -08:00
PCI: Remove unused pcibios_select_root() (again)
2015-06-08 07:56:21 -05:00
PCI: Add pci_iomap_wc() variants
2015-08-25 09:59:45 +02:00
percpu: preffity percpu header files
2014-06-17 19:12:40 -04:00
powerpc/mm: Fix Multi hit ERAT cause by recent THP update
2016-02-15 21:10:04 +11:00
sched/core: Create preempt_count invariant
2015-10-06 17:08:14 +02:00
locking/qrwlock: Make use of _{acquire|release|relaxed}() atomics
2015-08-12 11:59:06 +02:00
locking/qrwlock: Rename ->lock to ->wait_lock
2015-09-18 09:27:29 +02:00
locking/qspinlock: Move __ARCH_SPIN_LOCK_UNLOCKED to qspinlock_types.h
2016-02-29 10:02:43 +01:00
locking/qspinlock: Move __ARCH_SPIN_LOCK_UNLOCKED to qspinlock_types.h
2016-02-29 10:02:43 +01:00
asm-generic: remove _STK_LIM_MAX
2014-05-15 00:32:09 +01:00
rtc: cmos: century support
2015-09-05 13:19:09 +02:00
locking/rwsem: Use acquire/release semantics
2015-10-06 17:28:24 +02:00
seccomp: allow COMPAT sigreturn overrides
2015-04-17 09:04:09 -04:00
asm/sections: add helpers to check for section data
2016-01-16 11:17:24 -08:00
constify copy_siginfo_to_user{,32}()
2013-11-09 00:16:29 -05:00
crypto: create generic version of ablk_helper
2013-09-24 06:02:24 +10:00
syscall.h: fix doc text for syscall_get_arch()
2014-09-23 16:20:00 -04:00
treewide: Remove old email address
2015-11-23 09:44:58 +01:00
asm-generic: {get,put}_user ptr argument evaluate only 1 time
2015-11-08 22:44:42 +09:00
asm-generic: allow generic unaligned access if the arch supports it
2014-05-08 10:22:23 +02:00
arch: Introduce post-init read-only memory
2016-02-22 08:51:38 +01:00
include/asm-generic/vtime.h: avoid zero-length file
2013-09-30 14:31:02 -07:00
Make asm/word-at-a-time.h available on all architectures
2015-07-08 16:41:55 -04:00
d09e356ad0