Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f5425ef authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security 

Pull security subsystem fixes from James Morris.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  KEYS: remove a bogus NULL check
  ima: Fix build failure on powerpc when TCG_IBMVTPM dependencies are not met
  KEYS: Fix stale key registration at error path
parents c103b21c 5057975a

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;

security/keys/key.c

+4 −6
Original line number Diff line number Diff line
@@ -276,12 +276,10 @@ struct key *key_alloc(struct key_type *type, const char *desc, 
	if (!key)

		goto no_memory_2;



	if (desc) {

	key->index_key.desc_len = desclen;

	key->index_key.description = kmemdup(desc, desclen + 1, GFP_KERNEL);

	if (!key->description)

		goto no_memory_3;

	}



	atomic_set(&key->usage, 1);

	init_rwsem(&key->sem);