Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d51b4d8 authored by Christian Lamparter's avatar Christian Lamparter Committed by Greg Kroah-Hartman
Browse files

crypto: crypto4xx - fix double-free in crypto4xx_destroy_sdr 



commit 746c908c4d72e49068ab216c3926d2720d71a90d upstream.

This patch fixes a crash that can happen during probe
when the available dma memory is not enough (this can
happen if the crypto4xx is built as a module).

The descriptor window mapping would end up being free'd
twice, once in crypto4xx_build_pdr() and the second time
in crypto4xx_destroy_sdr().

Fixes: 5d59ad6e ("crypto: crypto4xx - fix crypto4xx_build_pdr, crypto4xx_build_sdr leak")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarChristian Lamparter <chunkeey@gmail.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5cbc7ff5

drivers/crypto/amcc/crypto4xx_core.c

+1 −5
Original line number Diff line number Diff line
@@ -373,12 +373,8 @@ static u32 crypto4xx_build_sdr(struct crypto4xx_device *dev) 
		dma_alloc_coherent(dev->core_dev->device,

			PPC4XX_SD_BUFFER_SIZE * PPC4XX_NUM_SD,

			&dev->scatter_buffer_pa, GFP_ATOMIC);

	if (!dev->scatter_buffer_va) {

		dma_free_coherent(dev->core_dev->device,

				  sizeof(struct ce_sd) * PPC4XX_NUM_SD,

				  dev->sdr, dev->sdr_pa);

	if (!dev->scatter_buffer_va)

		return -ENOMEM;

	}



	for (i = 0; i < PPC4XX_NUM_SD; i++) {

		dev->sdr[i].ptr = dev->scatter_buffer_pa +