diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-21 20:44:37 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-21 20:44:37 -0700 |
commit | 7f313ff0acdecf0926ab127533a2a93948a2f547 (patch) | |
tree | a82dc675035d735820656c7fa21ed409b257bd4b /security/selinux/ima.c | |
parent | 2c5a5358feff2c1e035a67a9b352c4358e669e5b (diff) | |
parent | 4a48b4c428dc92b5e0b19de83e7eb8d530dddd48 (diff) | |
download | linux-7f313ff0acdecf0926ab127533a2a93948a2f547.tar.gz linux-7f313ff0acdecf0926ab127533a2a93948a2f547.tar.bz2 linux-7f313ff0acdecf0926ab127533a2a93948a2f547.zip |
Merge tag 'integrity-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity
Pull integrity subsystem updates from Mimi Zohar:
"Except for extending the 'encrypted' key type to support user provided
data, the rest is code cleanup, __setup() usage bug fix, and a trivial
change"
* tag 'integrity-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
MAINTAINERS: add missing security/integrity/platform_certs
EVM: fix the evm= __setup handler return value
KEYS: encrypted: Instantiate key with user-provided decrypted data
ima: define ima_max_digest_data struct without a flexible array variable
ima: rename IMA_ACTION_FLAGS to IMA_NONACTION_FLAGS
ima: Return error code obtained from securityfs functions
MAINTAINERS: add missing "security/integrity" directory
ima: Fix trivial typos in the comments
Diffstat (limited to 'security/selinux/ima.c')
0 files changed, 0 insertions, 0 deletions