diff options
| author | Colin Ian King <colin.king@canonical.com> | 2018-01-12 16:10:18 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-01-15 15:50:35 +0100 |
| commit | bd12b21ec3a20818db229aea67526f3ed6bc096d (patch) | |
| tree | bb92b5e22f67004a2539fde2174deee8b1570a0a | |
| parent | 14812d5f7165f5c961c68c3c9410416c501b94d3 (diff) | |
| download | linux-stable-bd12b21ec3a20818db229aea67526f3ed6bc096d.tar.gz linux-stable-bd12b21ec3a20818db229aea67526f3ed6bc096d.tar.bz2 linux-stable-bd12b21ec3a20818db229aea67526f3ed6bc096d.zip | |
staging: ccree: fix memory leaks in cc_ivgen_init
The current error exit path in function cc_ivgen_init via label
'out' free's resources from the drvdata->ivgen_handle context.
However, drvdata->ivgen_handle has not been assigned to the
context ivgen_ctx at this point, so the resources are not freed.
Fix this by setting drvdata->ivgen_handle to ivgen_ctx as early
as possible so that the clean up error exit return path can free
the resources.
Detected by CoveritScan, CID#1463795 ("Resource leak")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/ccree/cc_ivgen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/ccree/cc_ivgen.c b/drivers/staging/ccree/cc_ivgen.c index 25a3131a93ce..c47f419b277b 100644 --- a/drivers/staging/ccree/cc_ivgen.c +++ b/drivers/staging/ccree/cc_ivgen.c @@ -178,6 +178,8 @@ int cc_ivgen_init(struct cc_drvdata *drvdata) if (!ivgen_ctx) return -ENOMEM; + drvdata->ivgen_handle = ivgen_ctx; + /* 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, @@ -196,8 +198,6 @@ int cc_ivgen_init(struct cc_drvdata *drvdata) goto out; } - drvdata->ivgen_handle = ivgen_ctx; - return cc_init_iv_sram(drvdata); out: |