stating: ccree: revert "staging: ccree: fix leak of import() after init()"
authorGilad Ben-Yossef <gilad@benyossef.com>
Sun, 7 Jan 2018 12:14:22 +0000 (12:14 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Apr 2019 06:37:44 +0000 (08:37 +0200)
commit 293edc27f8bc8a44978e9e95902b07b74f1c7523 upstream

This reverts commit c5f39d07860c ("staging: ccree: fix leak of import()
after init()") and commit aece09024414 ("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: Gilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/staging/ccree/ssi_hash.c

index e266a70a1b32e557b51ac4be4318aab40f1c3339..13291aeaf350ba20e26236f4a20eb025f45a5c7e 100644 (file)
@@ -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 ahash_req_ctx *state = ahash_request_ctx(req);
        u32 tmp;
-       int rc = 0;
+       int rc;
 
        memcpy(&tmp, in, sizeof(u32));
        if (tmp != CC_EXPORT_MAGIC) {
@@ -1790,12 +1790,9 @@ static int ssi_ahash_import(struct ahash_request *req, const void *in)
        }
        in += sizeof(u32);
 
-       /* call init() to allocate bufs if the user hasn't */
-       if (!state->digest_buff) {
-               rc = ssi_hash_init(state, ctx);
-               if (rc)
-                       goto out;
-       }
+       rc = ssi_hash_init(state, ctx);
+       if (rc)
+               goto out;
 
        dma_sync_single_for_cpu(dev, state->digest_buff_dma_addr,
                                ctx->inter_digestsize, DMA_BIDIRECTIONAL);