Merge branch 'next-integrity' of...
Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security Pull integrity updates from James Morris: "Mimi Zohar says: 'Linux 5.0 introduced the platform keyring to allow verifying the IMA kexec kernel image signature using the pre-boot keys. This pull request similarly makes keys on the platform keyring accessible for verifying the PE kernel image signature. Also included in this pull request is a new IMA hook that tags tmp files, in policy, indicating the file hash needs to be calculated. The remaining patches are cleanup'" * 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: evm: Use defined constant for UUID representation ima: define ima_post_create_tmpfile() hook and add missing call evm: remove set but not used variable 'xattr' encrypted-keys: fix Opt_err/Opt_error = -1 kexec, KEYS: Make use of platform keyring for signature verify integrity, KEYS: add a reference to platform keyring
Showing
- arch/x86/kernel/kexec-bzimage64.c 11 additions, 3 deletionsarch/x86/kernel/kexec-bzimage64.c
- certs/system_keyring.c 22 additions, 1 deletioncerts/system_keyring.c
- fs/namei.c 1 addition, 0 deletionsfs/namei.c
- include/keys/system_keyring.h 8 additions, 0 deletionsinclude/keys/system_keyring.h
- include/linux/ima.h 5 additions, 0 deletionsinclude/linux/ima.h
- include/linux/verification.h 1 addition, 0 deletionsinclude/linux/verification.h
- security/integrity/digsig.c 3 additions, 0 deletionssecurity/integrity/digsig.c
- security/integrity/evm/evm_crypto.c 1 addition, 2 deletionssecurity/integrity/evm/evm_crypto.c
- security/integrity/evm/evm_main.c 1 addition, 5 deletionssecurity/integrity/evm/evm_main.c
- security/integrity/ima/ima_main.c 33 additions, 2 deletionssecurity/integrity/ima/ima_main.c
- security/keys/encrypted-keys/encrypted.c 2 additions, 2 deletionssecurity/keys/encrypted-keys/encrypted.c
Loading
Please register or sign in to comment