On Fri, Nov 08, 2019 at 09:45:17AM +0000, Corentin Labbe wrote:
> This patch fixes two resources leak that occur on error path.
>
> Reported-by: coverity-bot <keescook+coverity-bot@xxxxxxxxxxxx>
> Addresses-Coverity-ID: 1487403 ("RESOURCE_LEAK")
> Addresses-Coverity-ID: 1487401 ("Resource leaks")
> Fixes: 48fe583fe541 ("crypto: amlogic - Add crypto accelerator for amlogic GXL")
> Signed-off-by: Corentin Labbe <clabbe@xxxxxxxxxxxx>
Thanks!
Reviewed-by: Kees Cook <keescook@xxxxxxxxxxxx>
-Kees
> ---
> drivers/crypto/amlogic/amlogic-gxl-cipher.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/crypto/amlogic/amlogic-gxl-cipher.c b/drivers/crypto/amlogic/amlogic-gxl-cipher.c
> index e9283ffdbd23..58b717aab6e8 100644
> --- a/drivers/crypto/amlogic/amlogic-gxl-cipher.c
> +++ b/drivers/crypto/amlogic/amlogic-gxl-cipher.c
> @@ -131,7 +131,8 @@ static int meson_cipher(struct skcipher_request *areq)
> if (areq->iv && ivsize > 0) {
> if (ivsize > areq->cryptlen) {
> dev_err(mc->dev, "invalid ivsize=%d vs len=%d\n", ivsize, areq->cryptlen);
> - return -EINVAL;
> + err = -EINVAL;
> + goto theend;
> }
> memcpy(bkeyiv + 32, areq->iv, ivsize);
> keyivlen = 48;
> @@ -151,9 +152,10 @@ static int meson_cipher(struct skcipher_request *areq)
>
> phykeyiv = dma_map_single(mc->dev, bkeyiv, keyivlen,
> DMA_TO_DEVICE);
> - if (dma_mapping_error(mc->dev, phykeyiv)) {
> + err = dma_mapping_error(mc->dev, phykeyiv);
> + if (err) {
> dev_err(mc->dev, "Cannot DMA MAP KEY IV\n");
> - return -EFAULT;
> + goto theend;
> }
>
> tloffset = 0;
> @@ -245,7 +247,6 @@ static int meson_cipher(struct skcipher_request *areq)
> if (areq->iv && ivsize > 0) {
> if (rctx->op_dir == MESON_DECRYPT) {
> memcpy(areq->iv, backup_iv, ivsize);
> - kzfree(backup_iv);
> } else {
> scatterwalk_map_and_copy(areq->iv, areq->dst,
> areq->cryptlen - ivsize,
> @@ -254,6 +255,7 @@ static int meson_cipher(struct skcipher_request *areq)
> }
> theend:
> kzfree(bkeyiv);
> + kzfree(backup_iv);
>
> return err;
> }
> --
> 2.23.0
>
--
Kees Cook
