diff options
Diffstat (limited to 'security')
-rw-r--r-- | security/integrity/evm/evm_crypto.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/security/integrity/evm/evm_crypto.c b/security/integrity/evm/evm_crypto.c index 4ad657d88097..8738deff26fa 100644 --- a/security/integrity/evm/evm_crypto.c +++ b/security/integrity/evm/evm_crypto.c | |||
@@ -27,26 +27,35 @@ static int evmkey_len = MAX_KEY_SIZE; | |||
27 | 27 | ||
28 | struct crypto_shash *hmac_tfm; | 28 | struct crypto_shash *hmac_tfm; |
29 | 29 | ||
30 | static DEFINE_MUTEX(mutex); | ||
31 | |||
30 | static struct shash_desc *init_desc(void) | 32 | static struct shash_desc *init_desc(void) |
31 | { | 33 | { |
32 | int rc; | 34 | int rc; |
33 | struct shash_desc *desc; | 35 | struct shash_desc *desc; |
34 | 36 | ||
35 | if (hmac_tfm == NULL) { | 37 | if (hmac_tfm == NULL) { |
38 | mutex_lock(&mutex); | ||
39 | if (hmac_tfm) | ||
40 | goto out; | ||
36 | hmac_tfm = crypto_alloc_shash(evm_hmac, 0, CRYPTO_ALG_ASYNC); | 41 | hmac_tfm = crypto_alloc_shash(evm_hmac, 0, CRYPTO_ALG_ASYNC); |
37 | if (IS_ERR(hmac_tfm)) { | 42 | if (IS_ERR(hmac_tfm)) { |
38 | pr_err("Can not allocate %s (reason: %ld)\n", | 43 | pr_err("Can not allocate %s (reason: %ld)\n", |
39 | evm_hmac, PTR_ERR(hmac_tfm)); | 44 | evm_hmac, PTR_ERR(hmac_tfm)); |
40 | rc = PTR_ERR(hmac_tfm); | 45 | rc = PTR_ERR(hmac_tfm); |
41 | hmac_tfm = NULL; | 46 | hmac_tfm = NULL; |
47 | mutex_unlock(&mutex); | ||
42 | return ERR_PTR(rc); | 48 | return ERR_PTR(rc); |
43 | } | 49 | } |
44 | rc = crypto_shash_setkey(hmac_tfm, evmkey, evmkey_len); | 50 | rc = crypto_shash_setkey(hmac_tfm, evmkey, evmkey_len); |
45 | if (rc) { | 51 | if (rc) { |
46 | crypto_free_shash(hmac_tfm); | 52 | crypto_free_shash(hmac_tfm); |
47 | hmac_tfm = NULL; | 53 | hmac_tfm = NULL; |
54 | mutex_unlock(&mutex); | ||
48 | return ERR_PTR(rc); | 55 | return ERR_PTR(rc); |
49 | } | 56 | } |
57 | out: | ||
58 | mutex_unlock(&mutex); | ||
50 | } | 59 | } |
51 | 60 | ||
52 | desc = kmalloc(sizeof(*desc) + crypto_shash_descsize(hmac_tfm), | 61 | desc = kmalloc(sizeof(*desc) + crypto_shash_descsize(hmac_tfm), |