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 /MAINTAINERS | |
| parent | 2c5a5358feff2c1e035a67a9b352c4358e669e5b (diff) | |
| parent | 4a48b4c428dc92b5e0b19de83e7eb8d530dddd48 (diff) | |
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 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 625ae3ca69b7..4386b12f86e8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7280,7 +7280,9 @@ Extended Verification Module (EVM) M: Mimi Zohar <zohar@linux.ibm.com> L: linux-integrity@vger.kernel.org S: Supported +T: git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git F: security/integrity/evm/ +F: security/integrity/ EXTENSIBLE FIRMWARE INTERFACE (EFI) M: Ard Biesheuvel <ardb@kernel.org> @@ -9537,6 +9539,7 @@ L: linux-integrity@vger.kernel.org S: Supported T: git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git F: security/integrity/ima/ +F: security/integrity/ INTEL 810/815 FRAMEBUFFER DRIVER M: Antonino Daplas <adaplas@gmail.com> @@ -10675,6 +10678,14 @@ F: include/linux/keyctl.h F: include/uapi/linux/keyctl.h F: security/keys/ +KEYS/KEYRINGS_INTEGRITY +M: Jarkko Sakkinen <jarkko@kernel.org> +M: Mimi Zohar <zohar@linux.ibm.com> +L: linux-integrity@vger.kernel.org +L: keyrings@vger.kernel.org +S: Supported +F: security/integrity/platform_certs + KFENCE M: Alexander Potapenko <glider@google.com> M: Marco Elver <elver@google.com> |