kernel_optimize_test/Documentation/security
Linus Torvalds 683b96f4d1 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull security subsystem updates from James Morris:
 "Generally pretty quiet for this release. Highlights:

  Yama:
   - allow ptrace access for original parent after re-parenting

  TPM:
   - add documentation
   - many bugfixes & cleanups
   - define a generic open() method for ascii & bios measurements

  Integrity:
   - Harden against malformed xattrs

  SELinux:
   - bugfixes & cleanups

  Smack:
   - Remove unnecessary smack_known_invalid label
   - Do not apply star label in smack_setprocattr hook
   - parse mnt opts after privileges check (fixes unpriv DoS vuln)"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (56 commits)
  Yama: allow access for the current ptrace parent
  tpm: adjust return value of tpm_read_log
  tpm: vtpm_proxy: conditionally call tpm_chip_unregister
  tpm: Fix handling of missing event log
  tpm: Check the bios_dir entry for NULL before accessing it
  tpm: return -ENODEV if np is not set
  tpm: cleanup of printk error messages
  tpm: replace of_find_node_by_name() with dev of_node property
  tpm: redefine read_log() to handle ACPI/OF at runtime
  tpm: fix the missing .owner in tpm_bios_measurements_ops
  tpm: have event log use the tpm_chip
  tpm: drop tpm1_chip_register(/unregister)
  tpm: replace dynamically allocated bios_dir with a static array
  tpm: replace symbolic permission with octal for securityfs files
  char: tpm: fix kerneldoc tpm2_unseal_trusted name typo
  tpm_tis: Allow tpm_tis to be bound using DT
  tpm, tpm_vtpm_proxy: add kdoc comments for VTPM_PROXY_IOC_NEW_DEV
  tpm: Only call pm_runtime_get_sync if device has a parent
  tpm: define a generic open() method for ascii & bios measurements
  Documentation: tpm: add the Physical TPM device tree binding documentation
  ...
2016-12-14 13:57:44 -08:00
..
tpm tpm: move documentation under Documentation/security 2016-11-07 18:56:42 -07:00
00-INDEX ima: new templates management mechanism 2013-10-25 17:17:04 -04:00
apparmor.txt
conf.py docs: Add more manuals to the PDF build 2016-11-16 16:07:02 -07:00
credentials.txt Documentation: clarify the purpose of LSMs 2011-11-16 12:37:27 +11:00
IMA-templates.txt ima: added support for new kernel cmdline parameter ima_template_fmt 2014-10-13 08:39:02 -04:00
index.rst tpm: move documentation under Documentation/security 2016-11-07 18:56:42 -07:00
keys-ecryptfs.txt encrypted-keys: move ecryptfs documentation to proper location 2011-06-30 19:08:14 +10:00
keys-request-key.txt
keys-trusted-encrypted.txt Doc: security: keys-trusted: drop duplicate blobauth entry 2016-11-13 22:50:10 -05:00
keys.txt KEYS: Add placeholder for KDF usage with DH 2016-06-03 16:14:34 +10:00
LoadPin.txt LSM: LoadPin for kernel file loading restrictions 2016-04-21 10:47:27 +10:00
LSM.txt doc: LSM: update reference, kerneltrap.org no longer works 2014-06-19 15:15:28 +02:00
self-protection.txt docs: self-protection: rename "leak" to "exposure" 2016-06-09 13:23:27 -06:00
SELinux.txt
Smack.txt Smack: limited capability for changing process label 2015-10-19 12:06:47 -07:00
tomoyo.txt
Yama.txt Yama: remove needless CONFIG_SECURITY_YAMA_STACKED 2015-07-28 13:18:19 +10:00