FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-27 03:47:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'evm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kasatkin/linux-digsig into for-linus

Browse Source
This commit is contained in:
James Morris 2011-12-21 11:28:16 +11:00
commit 428f328175
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
security/integrity/evm/evm_crypto.c
View File

@ -27,20 +27,35 @@ static int evmkey_len = MAX_KEY_SIZE;
struct crypto_shash *hmac_tfm; struct crypto_shash *hmac_tfm;
static DEFINE_MUTEX(mutex);
static struct shash_desc *init_desc(void) static struct shash_desc *init_desc(void)
{ {
int rc; int rc;
struct shash_desc *desc; struct shash_desc *desc;
if (hmac_tfm == NULL) { if (hmac_tfm == NULL) {
mutex_lock(&mutex);
if (hmac_tfm)
goto out;
hmac_tfm = crypto_alloc_shash(evm_hmac, 0, CRYPTO_ALG_ASYNC); hmac_tfm = crypto_alloc_shash(evm_hmac, 0, CRYPTO_ALG_ASYNC);
if (IS_ERR(hmac_tfm)) { if (IS_ERR(hmac_tfm)) {
pr_err("Can not allocate %s (reason: %ld)\n", pr_err("Can not allocate %s (reason: %ld)\n",
evm_hmac, PTR_ERR(hmac_tfm)); evm_hmac, PTR_ERR(hmac_tfm));
rc = PTR_ERR(hmac_tfm); rc = PTR_ERR(hmac_tfm);
hmac_tfm = NULL; hmac_tfm = NULL;
mutex_unlock(&mutex);
return ERR_PTR(rc); 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), 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->tfm = hmac_tfm;
desc->flags = CRYPTO_TFM_REQ_MAY_SLEEP; 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); rc = crypto_shash_init(desc);
out:
if (rc) { if (rc) {
kfree(desc); kfree(desc);
return ERR_PTR(rc); return ERR_PTR(rc);