Skip to content

Commit

Permalink
evm: prevent racing during tfm allocation
Browse files Browse the repository at this point in the history
There is a small chance of racing during tfm allocation.
This patch fixes it.

Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@intel.com>
Acked-by: Mimi Zohar <zohar@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
  • Loading branch information
Dmitry Kasatkin authored and James Morris committed Dec 7, 2011
1 parent 88d7ed3 commit 143b01d
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions security/integrity/evm/evm_crypto.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,11 @@ static int evmkey_len = MAX_KEY_SIZE;
struct crypto_shash *hmac_tfm;
struct crypto_shash *hash_tfm;

static DEFINE_MUTEX(mutex);

static struct shash_desc *init_desc(const char type)
{
int rc;
long rc;
char *algo;
struct crypto_shash **tfm;
struct shash_desc *desc;
Expand All @@ -44,22 +46,28 @@ static struct shash_desc *init_desc(const char type)
}

if (*tfm == NULL) {
mutex_lock(&mutex);
if (*tfm)
goto out;
*tfm = crypto_alloc_shash(algo, 0, CRYPTO_ALG_ASYNC);
if (IS_ERR(*tfm)) {
pr_err("Can not allocate %s (reason: %ld)\n",
algo, PTR_ERR(*tfm));
rc = PTR_ERR(*tfm);
pr_err("Can not allocate %s (reason: %ld)\n", algo, rc);
*tfm = NULL;
mutex_unlock(&mutex);
return ERR_PTR(rc);
}
if (type == EVM_XATTR_HMAC) {
rc = crypto_shash_setkey(*tfm, evmkey, evmkey_len);
if (rc) {
crypto_free_shash(*tfm);
*tfm = NULL;
mutex_unlock(&mutex);
return ERR_PTR(rc);
}
}
out:
mutex_unlock(&mutex);
}

desc = kmalloc(sizeof(*desc) + crypto_shash_descsize(*tfm),
Expand Down

0 comments on commit 143b01d

Please sign in to comment.