Linus Torvalds 73a0bff205 Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity ... Pull IMA updates from Mimi Zohar: "Two new features - measuring certificates and querying IMA for a file hash - and three bug fixes: - Measuring certificates is like the rest of IMA, based on policy, but requires loading a custom policy. Certificates loaded onto a keyring, for example during early boot, before a custom policy has been loaded, are queued and only processed after loading the custom policy. - IMA calculates and caches files hashes. Other kernel subsystems, and possibly kernel modules, are interested in accessing these cached file hashes. The bug fixes prevent classifying a file short read (e.g. shutdown) as an invalid file signature, add a missing blank when displaying the securityfs policy rules containing LSM labels, and, lastly, fix the handling of the IMA policy information for unknown LSM labels" * 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity: IMA: Defined delayed workqueue to free the queued keys IMA: Call workqueue functions to measure queued keys IMA: Define workqueue for early boot key measurements IMA: pre-allocate buffer to hold keyrings string ima: ima/lsm policy rule loading logic bug fixes ima: add the ability to query the cached hash of a given file ima: Add a space after printing LSM rules for readability IMA: fix measuring asymmetric keys Kconfig IMA: Read keyrings= option from the IMA policy IMA: Add support to limit measuring keys KEYS: Call the IMA hook to measure keys IMA: Define an IMA hook to measure keys IMA: Add KEY_CHECK func to measure keys IMA: Check IMA policy flag ima: avoid appraise error for hash calc interrupt		2020-01-28 18:52:09 -08:00
..
encrypted-keys
trusted-keys	security: keys: trusted: fix lost handle flush	2019-12-17 11:46:43 +02:00
big_key.c
compat_dh.c
compat.c	KEYS: remove CONFIG_KEYS_COMPAT	2019-12-12 23:41:17 +02:00
dh.c
gc.c
internal.h	KEYS: remove CONFIG_KEYS_COMPAT	2019-12-12 23:41:17 +02:00
Kconfig	KEYS: remove CONFIG_KEYS_COMPAT	2019-12-12 23:41:17 +02:00
key.c	KEYS: Call the IMA hook to measure keys	2019-12-12 08:53:50 -05:00
keyctl_pkey.c
keyctl.c
keyring.c
Makefile	KEYS: remove CONFIG_KEYS_COMPAT	2019-12-12 23:41:17 +02:00
permission.c
persistent.c
proc.c
process_keys.c
request_key_auth.c	keys: Fix missing null pointer check in request_key_auth_describe()	2019-09-05 14:19:25 -07:00
request_key.c
sysctl.c
user_defined.c