Commit 297a5966 authored by Gilad Ben-Yossef's avatar Gilad Ben-Yossef Committed by Greg Kroah-Hartman

crypto: ccree - fix mem leak on error path

commit d574b707 upstream.

Fix a memory leak on the error path of IV generation code.
Signed-off-by: default avatarGilad Ben-Yossef <gilad@benyossef.com>
Cc: stable@vger.kernel.org # v4.19+
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5109c133
...@@ -154,9 +154,6 @@ void cc_ivgen_fini(struct cc_drvdata *drvdata) ...@@ -154,9 +154,6 @@ void cc_ivgen_fini(struct cc_drvdata *drvdata)
} }
ivgen_ctx->pool = NULL_SRAM_ADDR; ivgen_ctx->pool = NULL_SRAM_ADDR;
/* release "this" context */
kfree(ivgen_ctx);
} }
/*! /*!
...@@ -174,10 +171,12 @@ int cc_ivgen_init(struct cc_drvdata *drvdata) ...@@ -174,10 +171,12 @@ int cc_ivgen_init(struct cc_drvdata *drvdata)
int rc; int rc;
/* Allocate "this" context */ /* Allocate "this" context */
ivgen_ctx = kzalloc(sizeof(*ivgen_ctx), GFP_KERNEL); ivgen_ctx = devm_kzalloc(device, sizeof(*ivgen_ctx), GFP_KERNEL);
if (!ivgen_ctx) if (!ivgen_ctx)
return -ENOMEM; return -ENOMEM;
drvdata->ivgen_handle = ivgen_ctx;
/* Allocate pool's header for initial enc. key/IV */ /* Allocate pool's header for initial enc. key/IV */
ivgen_ctx->pool_meta = dma_alloc_coherent(device, CC_IVPOOL_META_SIZE, ivgen_ctx->pool_meta = dma_alloc_coherent(device, CC_IVPOOL_META_SIZE,
&ivgen_ctx->pool_meta_dma, &ivgen_ctx->pool_meta_dma,
...@@ -196,8 +195,6 @@ int cc_ivgen_init(struct cc_drvdata *drvdata) ...@@ -196,8 +195,6 @@ int cc_ivgen_init(struct cc_drvdata *drvdata)
goto out; goto out;
} }
drvdata->ivgen_handle = ivgen_ctx;
return cc_init_iv_sram(drvdata); return cc_init_iv_sram(drvdata);
out: out:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment