Commit 83b4ccf2 authored by Gilad Ben-Yossef's avatar Gilad Ben-Yossef Committed by Greg Kroah-Hartman

stating: ccree: revert "staging: ccree: fix leak of import() after init()"

commit 293edc27 upstream

This reverts commit c5f39d07 ("staging: ccree: fix leak of import()
after init()") and commit aece0902 ("staging: ccree: Uninitialized
return in ssi_ahash_import()").

This is the wrong solution and ends up relying on uninitialized memory,
although it was not obvious to me at the time.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarGilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSudip Mukherjee <sudipm.mukherjee@gmail.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 56dbdae0
...@@ -1781,7 +1781,7 @@ static int ssi_ahash_import(struct ahash_request *req, const void *in) ...@@ -1781,7 +1781,7 @@ static int ssi_ahash_import(struct ahash_request *req, const void *in)
struct device *dev = &ctx->drvdata->plat_dev->dev; struct device *dev = &ctx->drvdata->plat_dev->dev;
struct ahash_req_ctx *state = ahash_request_ctx(req); struct ahash_req_ctx *state = ahash_request_ctx(req);
u32 tmp; u32 tmp;
int rc = 0; int rc;
memcpy(&tmp, in, sizeof(u32)); memcpy(&tmp, in, sizeof(u32));
if (tmp != CC_EXPORT_MAGIC) { if (tmp != CC_EXPORT_MAGIC) {
...@@ -1790,12 +1790,9 @@ static int ssi_ahash_import(struct ahash_request *req, const void *in) ...@@ -1790,12 +1790,9 @@ static int ssi_ahash_import(struct ahash_request *req, const void *in)
} }
in += sizeof(u32); in += sizeof(u32);
/* call init() to allocate bufs if the user hasn't */
if (!state->digest_buff) {
rc = ssi_hash_init(state, ctx); rc = ssi_hash_init(state, ctx);
if (rc) if (rc)
goto out; goto out;
}
dma_sync_single_for_cpu(dev, state->digest_buff_dma_addr, dma_sync_single_for_cpu(dev, state->digest_buff_dma_addr,
ctx->inter_digestsize, DMA_BIDIRECTIONAL); ctx->inter_digestsize, DMA_BIDIRECTIONAL);
......
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