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

Commit b90fd098 authored by Pan Bian's avatar Pan Bian Committed by Greg Kroah-Hartman
Browse files

spi: img-spfi: fix potential double release 



[ Upstream commit e9a8ba9769a0e354341bc6cc01b98aadcea1dfe9 ]

The channels spfi->tx_ch and spfi->rx_ch are not set to NULL after they
are released. As a result, they will be released again, either on the
error handling branch in the same function or in the corresponding
remove function, i.e. img_spfi_remove(). This patch fixes the bug by
setting the two members to NULL.

Signed-off-by: default avatarPan Bian <bianpan2016@163.com>
Link: https://lore.kernel.org/r/1573007769-20131-1-git-send-email-bianpan2016@163.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 58b35c92

drivers/spi/spi-img-spfi.c

+2 −0
Original line number Diff line number Diff line
@@ -676,6 +676,8 @@ static int img_spfi_probe(struct platform_device *pdev) 
			dma_release_channel(spfi->tx_ch);

		if (spfi->rx_ch)

			dma_release_channel(spfi->rx_ch);

		spfi->tx_ch = NULL;

		spfi->rx_ch = NULL;

		dev_warn(spfi->dev, "Failed to get DMA channels, falling back to PIO mode\n");

	} else {

		master->dma_tx = spfi->tx_ch;