evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
Linus Torvalds 2014-12-17 09:52:49 -08:00
commit 5f5425ef55
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
security/integrity/ima/Kconfig
View file

@ -10,7 +10,7 @@ config IMA
select CRYPTO_HASH_INFO select CRYPTO_HASH_INFO
select TCG_TPM if HAS_IOMEM && !UML select TCG_TPM if HAS_IOMEM && !UML
select TCG_TIS if TCG_TPM && X86 select TCG_TIS if TCG_TPM && X86
select TCG_IBMVTPM if TCG_TPM && PPC64 select TCG_IBMVTPM if TCG_TPM && PPC_PSERIES
help help
The Trusted Computing Group(TCG) runtime Integrity The Trusted Computing Group(TCG) runtime Integrity
Measurement Architecture(IMA) maintains a list of hash Measurement Architecture(IMA) maintains a list of hash

5
security/keys/encrypted-keys/encrypted.c
View file

@ -1017,10 +1017,13 @@ static int __init init_encrypted(void)
ret = encrypted_shash_alloc(); ret = encrypted_shash_alloc();
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = aes_get_sizes();
if (ret < 0)
goto out;
ret = register_key_type(&key_type_encrypted); ret = register_key_type(&key_type_encrypted);
if (ret < 0) if (ret < 0)
goto out; goto out;
return aes_get_sizes(); return 0;
out: out:
encrypted_shash_release(); encrypted_shash_release();
return ret; return ret;

2
security/keys/key.c
View file

@ -276,12 +276,10 @@ struct key *key_alloc(struct key_type *type, const char *desc,
if (!key) if (!key)
goto no_memory_2; goto no_memory_2;
if (desc) {
key->index_key.desc_len = desclen; key->index_key.desc_len = desclen;
key->index_key.description = kmemdup(desc, desclen + 1, GFP_KERNEL); key->index_key.description = kmemdup(desc, desclen + 1, GFP_KERNEL);
if (!key->description) if (!key->description)
goto no_memory_3; goto no_memory_3;
}
atomic_set(&key->usage, 1); atomic_set(&key->usage, 1);
init_rwsem(&key->sem); init_rwsem(&key->sem);