Commit d0bffab0 authored by James Morris's avatar James Morris
Browse files

Merge branch 'next' of... 

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

security/integrity/ima/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ config IMA 
	select CRYPTO_HASH_INFO

	select TCG_TPM if HAS_IOMEM && !UML

	select TCG_TIS if TCG_TPM && X86

	select TCG_IBMVTPM if TCG_TPM && PPC64

	select TCG_IBMVTPM if TCG_TPM && PPC_PSERIES

	help

	  The Trusted Computing Group(TCG) runtime Integrity

	  Measurement Architecture(IMA) maintains a list of hash

security/keys/encrypted-keys/encrypted.c

+4 −1
Original line number Diff line number Diff line
@@ -1017,10 +1017,13 @@ static int __init init_encrypted(void) 
	ret = encrypted_shash_alloc();

	if (ret < 0)

		return ret;

	ret = aes_get_sizes();

	if (ret < 0)

		goto out;

	ret = register_key_type(&key_type_encrypted);

	if (ret < 0)

		goto out;

	return aes_get_sizes();

	return 0;

out:

	encrypted_shash_release();

	return ret;