tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into for-linus

James Morris d0bffab0 988adfdf

+5 -2
+1 -1
security/integrity/ima/Kconfig
··· 10 10 select CRYPTO_HASH_INFO 11 11 select TCG_TPM if HAS_IOMEM && !UML 12 12 select TCG_TIS if TCG_TPM && X86 13 - select TCG_IBMVTPM if TCG_TPM && PPC64 13 + select TCG_IBMVTPM if TCG_TPM && PPC_PSERIES 14 14 help 15 15 The Trusted Computing Group(TCG) runtime Integrity 16 16 Measurement Architecture(IMA) maintains a list of hash
+4 -1
security/keys/encrypted-keys/encrypted.c
··· 1017 1017 ret = encrypted_shash_alloc(); 1018 1018 if (ret < 0) 1019 1019 return ret; 1020 + ret = aes_get_sizes(); 1021 + if (ret < 0) 1022 + goto out; 1020 1023 ret = register_key_type(&key_type_encrypted); 1021 1024 if (ret < 0) 1022 1025 goto out; 1023 - return aes_get_sizes(); 1026 + return 0; 1024 1027 out: 1025 1028 encrypted_shash_release(); 1026 1029 return ret;