]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
spi: mtk-snfi: Fix resource leak in mtk_snand_read_page_cache()
authorFelix Gu <ustc.gu@gmail.com>
Sat, 9 May 2026 17:55:37 +0000 (01:55 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Jun 2026 15:46:30 +0000 (17:46 +0200)
[ Upstream commit 496ba79b9496b8b3747cbc764ebd33ee7325e806 ]

When DMA read times out in mtk_snand_read_page_cache(), the original code
erroneously jumped to cleanup label which skips DMA unmapping and ECC
disable, causing a resource leak.

Fixes: 764f1b748164 ("spi: add driver for MTK SPI NAND Flash Interface")
Signed-off-by: Felix Gu <ustc.gu@gmail.com>
Link: https://patch.msgid.link/20260510-snfi-v1-1-bc375cf1af8e@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/spi/spi-mtk-snfi.c

index 8234064921f3640ac7a14b054305224ec0d03cc4..20260f577f056b24b4c4735e221b132d4a0f3efd 100644 (file)
@@ -961,7 +961,7 @@ static int mtk_snand_read_page_cache(struct mtk_snand *snf,
                    &snf->op_done, usecs_to_jiffies(SNFI_POLL_INTERVAL))) {
                dev_err(snf->dev, "DMA timed out for reading from cache.\n");
                ret = -ETIMEDOUT;
-               goto cleanup;
+               goto cleanup2;
        }
 
        // Wait for BUS_SEC_CNTR returning expected value