diff options
| author | James Morris <jmorris@namei.org> | 2011-12-21 11:28:16 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-12-21 11:28:16 +1100 |
| commit | 428f32817505f67992e8efe62d6a9c7cbb3f2498 (patch) | |
| tree | 2a343ad5315839591258ebc39da2761dfbc00f95 | |
| parent | a4a4923919f2d43583789b1f3603f4e5600d8321 (diff) | |
| parent | 97426f985729573cea06e82e271cc3929f1f5f8e (diff) | |
| download | linux-3.10-428f32817505f67992e8efe62d6a9c7cbb3f2498.tar.gz linux-3.10-428f32817505f67992e8efe62d6a9c7cbb3f2498.tar.bz2 linux-3.10-428f32817505f67992e8efe62d6a9c7cbb3f2498.zip | |
Merge branch 'evm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kasatkin/linux-digsig into for-linus
| -rw-r--r-- | security/integrity/evm/evm_crypto.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/security/integrity/evm/evm_crypto.c b/security/integrity/evm/evm_crypto.c index 5dd5b140242..8738deff26f 100644 --- a/security/integrity/evm/evm_crypto.c +++ b/security/integrity/evm/evm_crypto.c @@ -27,20 +27,35 @@ static int evmkey_len = MAX_KEY_SIZE; struct crypto_shash *hmac_tfm; +static DEFINE_MUTEX(mutex); + static struct shash_desc *init_desc(void) { int rc; struct shash_desc *desc; if (hmac_tfm == NULL) { + mutex_lock(&mutex); + if (hmac_tfm) + goto out; hmac_tfm = crypto_alloc_shash(evm_hmac, 0, CRYPTO_ALG_ASYNC); if (IS_ERR(hmac_tfm)) { pr_err("Can not allocate %s (reason: %ld)\n", evm_hmac, PTR_ERR(hmac_tfm)); rc = PTR_ERR(hmac_tfm); hmac_tfm = NULL; + mutex_unlock(&mutex); + return ERR_PTR(rc); + } + rc = crypto_shash_setkey(hmac_tfm, evmkey, evmkey_len); + if (rc) { + crypto_free_shash(hmac_tfm); + hmac_tfm = NULL; + mutex_unlock(&mutex); return ERR_PTR(rc); } +out: + mutex_unlock(&mutex); } desc = kmalloc(sizeof(*desc) + crypto_shash_descsize(hmac_tfm), @@ -51,11 +66,7 @@ static struct shash_desc *init_desc(void) desc->tfm = hmac_tfm; desc->flags = CRYPTO_TFM_REQ_MAY_SLEEP; - rc = crypto_shash_setkey(hmac_tfm, evmkey, evmkey_len); - if (rc) - goto out; rc = crypto_shash_init(desc); -out: if (rc) { kfree(desc); return ERR_PTR(rc); |