Linus Torvalds 8b68150883 Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity ... Pull integrity updates from Mimi Zohar: "Bug fixes, code clean up, and new features: - IMA policy rules can be defined in terms of LSM labels, making the IMA policy dependent on LSM policy label changes, in particular LSM label deletions. The new environment, in which IMA-appraisal is being used, frequently updates the LSM policy and permits LSM label deletions. - Prevent an mmap'ed shared file opened for write from also being mmap'ed execute. In the long term, making this and other similar changes at the VFS layer would be preferable. - The IMA per policy rule template format support is needed for a couple of new/proposed features (eg. kexec boot command line measurement, appended signatures, and VFS provided file hashes). - Other than the "boot-aggregate" record in the IMA measuremeent list, all other measurements are of file data. Measuring and storing the kexec boot command line in the IMA measurement list is the first buffer based measurement included in the measurement list" * 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity: integrity: Introduce struct evm_xattr ima: Update MAX_TEMPLATE_NAME_LEN to fit largest reasonable definition KEXEC: Call ima_kexec_cmdline to measure the boot command line args IMA: Define a new template field buf IMA: Define a new hook to measure the kexec boot command line arguments IMA: support for per policy rule template formats integrity: Fix __integrity_init_keyring() section mismatch ima: Use designated initializers for struct ima_event_data ima: use the lsm policy update notifier LSM: switch to blocking policy update notifiers x86/ima: fix the Kconfig dependency for IMA_ARCH_POLICY ima: Make arch_policy_entry static ima: prevent a file already mmap'ed write to be mmap'ed execute x86/ima: check EFI SetupMode too		2019-07-08 20:28:59 -07:00
..
keys	keys: Replace uid/gid/perm permissions checking with an ACL	2019-06-27 23:03:07 +01:00
tpm	tpm: move documentation under Documentation/security	2016-11-07 18:56:42 -07:00
credentials.rst	Documentation: Use "while" instead of "whilst"	2018-11-20 09:30:43 -07:00
IMA-templates.rst	IMA: Define a new template field buf	2019-06-30 17:53:45 -04:00
index.rst	doc: sctp: Merge and clean up rst files	2019-02-22 08:51:40 -07:00
LSM.rst	doc: security: Add kern-doc for lsm_hooks.h	2019-02-22 08:54:09 -07:00
SCTP.rst	doc: sctp: Merge and clean up rst files	2019-02-22 08:51:40 -07:00
self-protection.rst	doc: self-protection: Add information about STACKLEAK feature	2018-09-04 10:35:48 -07:00