linux/drivers/staging
Linus Torvalds 643ad15d47 Merge branch 'mm-pkeys-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 protection key support from Ingo Molnar:
 "This tree adds support for a new memory protection hardware feature
  that is available in upcoming Intel CPUs: 'protection keys' (pkeys).

  There's a background article at LWN.net:

      https://lwn.net/Articles/643797/

  The gist is that protection keys allow the encoding of
  user-controllable permission masks in the pte.  So instead of having a
  fixed protection mask in the pte (which needs a system call to change
  and works on a per page basis), the user can map a (handful of)
  protection mask variants and can change the masks runtime relatively
  cheaply, without having to change every single page in the affected
  virtual memory range.

  This allows the dynamic switching of the protection bits of large
  amounts of virtual memory, via user-space instructions.  It also
  allows more precise control of MMU permission bits: for example the
  executable bit is separate from the read bit (see more about that
  below).

  This tree adds the MM infrastructure and low level x86 glue needed for
  that, plus it adds a high level API to make use of protection keys -
  if a user-space application calls:

        mmap(..., PROT_EXEC);

  or

        mprotect(ptr, sz, PROT_EXEC);

  (note PROT_EXEC-only, without PROT_READ/WRITE), the kernel will notice
  this special case, and will set a special protection key on this
  memory range.  It also sets the appropriate bits in the Protection
  Keys User Rights (PKRU) register so that the memory becomes unreadable
  and unwritable.

  So using protection keys the kernel is able to implement 'true'
  PROT_EXEC on x86 CPUs: without protection keys PROT_EXEC implies
  PROT_READ as well.  Unreadable executable mappings have security
  advantages: they cannot be read via information leaks to figure out
  ASLR details, nor can they be scanned for ROP gadgets - and they
  cannot be used by exploits for data purposes either.

  We know about no user-space code that relies on pure PROT_EXEC
  mappings today, but binary loaders could start making use of this new
  feature to map binaries and libraries in a more secure fashion.

  There is other pending pkeys work that offers more high level system
  call APIs to manage protection keys - but those are not part of this
  pull request.

  Right now there's a Kconfig that controls this feature
  (CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS) that is default enabled
  (like most x86 CPU feature enablement code that has no runtime
  overhead), but it's not user-configurable at the moment.  If there's
  any serious problem with this then we can make it configurable and/or
  flip the default"

* 'mm-pkeys-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (38 commits)
  x86/mm/pkeys: Fix mismerge of protection keys CPUID bits
  mm/pkeys: Fix siginfo ABI breakage caused by new u64 field
  x86/mm/pkeys: Fix access_error() denial of writes to write-only VMA
  mm/core, x86/mm/pkeys: Add execute-only protection keys support
  x86/mm/pkeys: Create an x86 arch_calc_vm_prot_bits() for VMA flags
  x86/mm/pkeys: Allow kernel to modify user pkey rights register
  x86/fpu: Allow setting of XSAVE state
  x86/mm: Factor out LDT init from context init
  mm/core, x86/mm/pkeys: Add arch_validate_pkey()
  mm/core, arch, powerpc: Pass a protection key in to calc_vm_flag_bits()
  x86/mm/pkeys: Actually enable Memory Protection Keys in the CPU
  x86/mm/pkeys: Add Kconfig prompt to existing config option
  x86/mm/pkeys: Dump pkey from VMA in /proc/pid/smaps
  x86/mm/pkeys: Dump PKRU with other kernel registers
  mm/core, x86/mm/pkeys: Differentiate instruction fetches
  x86/mm/pkeys: Optimize fault handling in access_error()
  mm/core: Do not enforce PKEY permissions on remote mm access
  um, pkeys: Add UML arch_*_access_permitted() methods
  mm/gup, x86/mm/pkeys: Check VMAs and PTEs for protection keys
  x86/mm/gup: Simplify get_user_pages() PTE bit handling
  ...
2016-03-20 19:08:56 -07:00
..
android Merge branch 'mm-pkeys-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2016-03-20 19:08:56 -07:00
board Staging: board: Blank lines aren't necessary before a close brace 2016-02-07 19:57:22 -08:00
clocking-wizard Staging: clocking-wizard: CHECK:Please use a blank line 2016-02-07 20:05:31 -08:00
comedi Revert "staging: comedi: drivers: Remove unneeded NULL check before kfree()" 2016-03-10 19:35:54 -08:00
dgnc Staging driver patches for 4.6-rc1 2016-03-17 22:13:41 -07:00
emxx_udc Staging: emxx_udc: Return NULL instead of 0. 2016-03-11 22:09:09 -08:00
fbtft staging: fbtft: fb_uc1611.c: Drop void pointer cast 2016-03-11 22:09:09 -08:00
fsl-mc Staging: fsl-mc: Replace pr_err with dev_err 2016-03-11 22:09:09 -08:00
fwserial staging: fwserial: (coding-style) rewrite comparisons to NULL as "!fifo->data" 2016-02-07 19:36:14 -08:00
gdm724x Staging: gdm724x: Replace random_ether_addr with eth_random_addr 2016-03-05 14:48:04 -08:00
goldfish staging: goldfish: audio: fix compiliation on arm 2016-03-11 22:09:09 -08:00
gs_fpgaboot staging: gs_fpgaboot: drop wrapper function 'finish_driver' 2016-03-11 22:09:09 -08:00
i4l isdn: i4l: move active-isdn drivers to staging 2016-03-05 15:00:38 -08:00
iio staging: iio: addac: Remove unnecessary else after return 2016-03-11 22:09:09 -08:00
lustre Staging driver patches for 4.6-rc1 2016-03-17 22:13:41 -07:00
media Staging driver patches for 4.6-rc1 2016-03-17 22:13:41 -07:00
most staging: most: hdm-usb: Remove invalid reference error 2016-03-11 22:09:09 -08:00
mt29f_spinand staging: mt29f_spinand: Replacing pr_info with dev_info after the call to devm_kzalloc 2016-03-11 22:14:06 -08:00
netlogic staging: netlogic: Replacing pr_err with dev_err after the call to devm_kzalloc 2016-03-11 22:14:06 -08:00
nvec Staging: nvec: removes an unnecessary cast on a void pointer 2016-03-11 22:09:09 -08:00
octeon staging: octeon: Fix braces in condition statement 2016-03-11 22:09:09 -08:00
octeon-usb staging: octeon-usb: update TODO 2016-02-25 22:38:16 -08:00
rdma staging: rdma: hfi1: file_ops: Replace ALIGN with PAGE_ALIGN 2016-03-11 22:09:09 -08:00
rtl8188eu Staging: rtl8188eu: Remove function rtw_freq2ch 2016-03-11 22:09:09 -08:00
rtl8192e Staging driver patches for 4.6-rc1 2016-03-17 22:13:41 -07:00
rtl8192u Staging driver patches for 4.6-rc1 2016-03-17 22:13:41 -07:00
rtl8712 Staging: rtl8712: Remove function r8712_setptm_cmd and r8712_gettssi_cmd 2016-03-11 22:09:09 -08:00
rtl8723au Staging: rtl8723au: Remove unused functions and prototype 2016-03-11 22:09:09 -08:00
rts5208 staging: rts5208: Replace pci_enable_device with pcim_enable_device 2016-03-11 22:09:09 -08:00
skein staging: skein: threefish_block: Use rol64 2016-03-11 22:09:09 -08:00
slicoss Staging: slicoss: changes comparisons to NULL in slicoss.c 2016-03-11 22:09:09 -08:00
sm750fb Staging: sm750fb: Remove unused functions 2016-03-11 22:09:09 -08:00
speakup staging: speakup: Replace del_timer with del_timer_sync 2016-03-11 22:09:09 -08:00
ste_rmi4 staging: ste_rmi4: simplify NULL tests 2016-03-11 22:09:09 -08:00
unisys staging: unisys: visornic: Remove unnecessary else after return 2016-03-10 19:29:45 -08:00
vme staging: vme: devices: Replace kzalloc with devm_kzalloc 2016-03-11 22:09:09 -08:00
vt6655 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2016-03-19 10:05:34 -07:00
vt6656 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2016-03-19 10:05:34 -07:00
wilc1000 staging: wilc1000: Possible unnecessary 'out of memory' message 2016-03-11 22:09:09 -08:00
wlan-ng Staging: wlan-ng: Do not print message if kzalloc() failed. 2016-03-11 22:09:09 -08:00
xgifb Staging: xgifb: remove useless blank lines 2016-03-11 22:09:09 -08:00
Kconfig Staging: gdm72xx: Remove gdm72xx driver 2016-03-11 22:09:09 -08:00
Makefile Staging: gdm72xx: Remove gdm72xx driver 2016-03-11 22:09:09 -08:00