Commit ccf11dba authored by Dinghao Liu's avatar Dinghao Liu Committed by Mimi Zohar
Browse files

evm: Fix memleak in init_desc 



tmp_tfm is allocated, but not freed on subsequent kmalloc failure, which
leads to a memory leak.  Free tmp_tfm.

Fixes: d46eb369 ("evm: crypto hash replaced by shash")
Signed-off-by: default avatarDinghao Liu <dinghao.liu@zju.edu.cn>
[zohar@linux.ibm.com: formatted/reworded patch description]
Signed-off-by: default avatarMimi Zohar <zohar@linux.ibm.com>
parent 7c53f6b6

security/integrity/evm/evm_crypto.c

+5 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static struct shash_desc *init_desc(char type, uint8_t hash_algo) 
{

	long rc;

	const char *algo;

	struct crypto_shash **tfm, *tmp_tfm;

	struct crypto_shash **tfm, *tmp_tfm = NULL;

	struct shash_desc *desc;



	if (type == EVM_XATTR_HMAC) {
@@ -118,13 +118,16 @@ static struct shash_desc *init_desc(char type, uint8_t hash_algo) 
alloc:

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

			GFP_KERNEL);

	if (!desc)

	if (!desc) {

		crypto_free_shash(tmp_tfm);

		return ERR_PTR(-ENOMEM);

	}



	desc->tfm = *tfm;



	rc = crypto_shash_init(desc);

	if (rc) {

		crypto_free_shash(tmp_tfm);

		kfree(desc);

		return ERR_PTR(rc);

	}