renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 10:44:14 +08:00
Code

crypto: marvell - Fix memory leaks in TDMA chain for cipher requests

Browse Source 
So far in mv_cesa_ablkcipher_dma_req_init, if an error is thrown while
the tdma chain is built there is a memory leak. This issue exists
because the chain is assigned later at the end of the function, so the
cleanup function is called with the wrong version of the chain.

Fixes: db509a4533 ("crypto: marvell/cesa - add TDMA support")
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Romain Perier 2016-07-22 14:40:39 +02:00 committed by Herbert Xu
parent bbce2ad2d7
commit ec38f82e85
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/crypto/marvell/cipher.c
View File

@ -320,7 +320,6 @@ static int mv_cesa_ablkcipher_dma_req_init(struct ablkcipher_request *req,
GFP_KERNEL : GFP_ATOMIC; GFP_KERNEL : GFP_ATOMIC;
struct mv_cesa_req *basereq = &creq->base; struct mv_cesa_req *basereq = &creq->base;
struct mv_cesa_ablkcipher_dma_iter iter; struct mv_cesa_ablkcipher_dma_iter iter;
struct mv_cesa_tdma_chain chain;
bool skip_ctx = false; bool skip_ctx = false;
int ret; int ret;
unsigned int ivsize; unsigned int ivsize;
@ -347,13 +346,13 @@ static int mv_cesa_ablkcipher_dma_req_init(struct ablkcipher_request *req,
return -ENOMEM; return -ENOMEM;
} }
mv_cesa_tdma_desc_iter_init(&chain); mv_cesa_tdma_desc_iter_init(&basereq->chain);
mv_cesa_ablkcipher_req_iter_init(&iter, req); mv_cesa_ablkcipher_req_iter_init(&iter, req);
do { do {
struct mv_cesa_op_ctx *op; struct mv_cesa_op_ctx *op;
op = mv_cesa_dma_add_op(&chain, op_templ, skip_ctx, flags); op = mv_cesa_dma_add_op(&basereq->chain, op_templ, skip_ctx, flags);
if (IS_ERR(op)) { if (IS_ERR(op)) {
ret = PTR_ERR(op); ret = PTR_ERR(op);
goto err_free_tdma; goto err_free_tdma;
@ -363,18 +362,18 @@ static int mv_cesa_ablkcipher_dma_req_init(struct ablkcipher_request *req,
mv_cesa_set_crypt_op_len(op, iter.base.op_len); mv_cesa_set_crypt_op_len(op, iter.base.op_len);
/* Add input transfers */ /* Add input transfers */
ret = mv_cesa_dma_add_op_transfers(&chain, &iter.base, ret = mv_cesa_dma_add_op_transfers(&basereq->chain, &iter.base,
&iter.src, flags); &iter.src, flags);
if (ret) if (ret)
goto err_free_tdma; goto err_free_tdma;
/* Add dummy desc to launch the crypto operation */ /* Add dummy desc to launch the crypto operation */
ret = mv_cesa_dma_add_dummy_launch(&chain, flags); ret = mv_cesa_dma_add_dummy_launch(&basereq->chain, flags);
if (ret) if (ret)
goto err_free_tdma; goto err_free_tdma;
/* Add output transfers */ /* Add output transfers */
ret = mv_cesa_dma_add_op_transfers(&chain, &iter.base, ret = mv_cesa_dma_add_op_transfers(&basereq->chain, &iter.base,
&iter.dst, flags); &iter.dst, flags);
if (ret) if (ret)
goto err_free_tdma; goto err_free_tdma;
@ -383,13 +382,12 @@ static int mv_cesa_ablkcipher_dma_req_init(struct ablkcipher_request *req,
/* Add output data for IV */ /* Add output data for IV */
ivsize = crypto_ablkcipher_ivsize(crypto_ablkcipher_reqtfm(req)); ivsize = crypto_ablkcipher_ivsize(crypto_ablkcipher_reqtfm(req));
ret = mv_cesa_dma_add_iv_op(&chain, CESA_SA_CRYPT_IV_SRAM_OFFSET, ret = mv_cesa_dma_add_iv_op(&basereq->chain, CESA_SA_CRYPT_IV_SRAM_OFFSET,
ivsize, CESA_TDMA_SRC_IN_SRAM, flags); ivsize, CESA_TDMA_SRC_IN_SRAM, flags);
if (ret) if (ret)
goto err_free_tdma; goto err_free_tdma;
basereq->chain = chain;
basereq->chain.last->flags |= CESA_TDMA_END_OF_REQ; basereq->chain.last->flags |= CESA_TDMA_END_OF_REQ;
return 0; return 0;