* [PATCH] mtd: rawnand: rockchip: Add missing check after DMA map
@ 2025-07-07 7:15 Thomas Fourier
2025-07-28 10:17 ` Miquel Raynal
0 siblings, 1 reply; 2+ messages in thread
From: Thomas Fourier @ 2025-07-07 7:15 UTC (permalink / raw)
Cc: Thomas Fourier, Miquel Raynal, Richard Weinberger,
Vignesh Raghavendra, Heiko Stuebner, Uwe Kleine-König,
Jinjie Ruan, Yifeng Zhao, linux-mtd, linux-arm-kernel,
linux-rockchip, linux-kernel
The DMA map functions can fail and should be tested for errors.
Fixes: 058e0e847d54 ("mtd: rawnand: rockchip: NFC driver for RK3308, RK2928 and others")
Signed-off-by: Thomas Fourier <fourier.thomas@gmail.com>
---
drivers/mtd/nand/raw/rockchip-nand-controller.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/drivers/mtd/nand/raw/rockchip-nand-controller.c b/drivers/mtd/nand/raw/rockchip-nand-controller.c
index 63e7b9e39a5a..c5d7cd8a6cab 100644
--- a/drivers/mtd/nand/raw/rockchip-nand-controller.c
+++ b/drivers/mtd/nand/raw/rockchip-nand-controller.c
@@ -656,9 +656,16 @@ static int rk_nfc_write_page_hwecc(struct nand_chip *chip, const u8 *buf,
dma_data = dma_map_single(nfc->dev, (void *)nfc->page_buf,
mtd->writesize, DMA_TO_DEVICE);
+ if (dma_mapping_error(nfc->dev, dma_data))
+ return -ENOMEM;
+
dma_oob = dma_map_single(nfc->dev, nfc->oob_buf,
ecc->steps * oob_step,
DMA_TO_DEVICE);
+ if (dma_mapping_error(nfc->dev, dma_oob)) {
+ dma_unmap_single(nfc->dev, dma_data, mtd->writesize, DMA_TO_DEVICE);
+ return -ENOMEM;
+ }
reinit_completion(&nfc->done);
writel(INT_DMA, nfc->regs + nfc->cfg->int_en_off);
@@ -772,9 +779,17 @@ static int rk_nfc_read_page_hwecc(struct nand_chip *chip, u8 *buf, int oob_on,
dma_data = dma_map_single(nfc->dev, nfc->page_buf,
mtd->writesize,
DMA_FROM_DEVICE);
+ if (dma_mapping_error(nfc->dev, dma_data))
+ return -ENOMEM;
+
dma_oob = dma_map_single(nfc->dev, nfc->oob_buf,
ecc->steps * oob_step,
DMA_FROM_DEVICE);
+ if (dma_mapping_error(nfc->dev, dma_oob)) {
+ dma_unmap_single(nfc->dev, dma_data, mtd->writesize,
+ DMA_FROM_DEVICE);
+ return -ENOMEM;
+ }
/*
* The first blocks (4, 8 or 16 depending on the device)
--
2.43.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mtd: rawnand: rockchip: Add missing check after DMA map
2025-07-07 7:15 [PATCH] mtd: rawnand: rockchip: Add missing check after DMA map Thomas Fourier
@ 2025-07-28 10:17 ` Miquel Raynal
0 siblings, 0 replies; 2+ messages in thread
From: Miquel Raynal @ 2025-07-28 10:17 UTC (permalink / raw)
To: Thomas Fourier
Cc: Richard Weinberger, Vignesh Raghavendra, Heiko Stuebner,
Uwe Kleine-König, Jinjie Ruan, Yifeng Zhao, linux-mtd,
linux-arm-kernel, linux-rockchip, linux-kernel
On Mon, 07 Jul 2025 09:15:50 +0200, Thomas Fourier wrote:
> The DMA map functions can fail and should be tested for errors.
>
>
Applied to nand/next, thanks!
[1/1] mtd: rawnand: rockchip: Add missing check after DMA map
commit: fd277532a84f4c9d9129a87e73dde6a6d9f34200
Patche(s) should be available on mtd/linux.git and will be
part of the next PR (provided that no robot complains by then).
Kind regards,
Miquèl
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-07-28 10:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-07-07 7:15 [PATCH] mtd: rawnand: rockchip: Add missing check after DMA map Thomas Fourier
2025-07-28 10:17 ` Miquel Raynal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).