| From 79e441ee47949376e3bc20f085cf017b70523d0f Mon Sep 17 00:00:00 2001 |
| From: Thomas Fourier <fourier.thomas@gmail.com> |
| Date: Wed, 2 Jul 2025 10:01:06 +0200 |
| Subject: mtd: rawnand: renesas: Add missing check after DMA map |
| |
| From: Thomas Fourier <fourier.thomas@gmail.com> |
| |
| commit 79e441ee47949376e3bc20f085cf017b70523d0f upstream. |
| |
| The DMA map functions can fail and should be tested for errors. |
| |
| Fixes: d8701fe890ec ("mtd: rawnand: renesas: Add new NAND controller driver") |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Thomas Fourier <fourier.thomas@gmail.com> |
| Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/mtd/nand/raw/renesas-nand-controller.c | 6 ++++++ |
| 1 file changed, 6 insertions(+) |
| |
| --- a/drivers/mtd/nand/raw/renesas-nand-controller.c |
| +++ b/drivers/mtd/nand/raw/renesas-nand-controller.c |
| @@ -426,6 +426,9 @@ static int rnandc_read_page_hw_ecc(struc |
| /* Configure DMA */ |
| dma_addr = dma_map_single(rnandc->dev, rnandc->buf, mtd->writesize, |
| DMA_FROM_DEVICE); |
| + if (dma_mapping_error(rnandc->dev, dma_addr)) |
| + return -ENOMEM; |
| + |
| writel(dma_addr, rnandc->regs + DMA_ADDR_LOW_REG); |
| writel(mtd->writesize, rnandc->regs + DMA_CNT_REG); |
| writel(DMA_TLVL_MAX, rnandc->regs + DMA_TLVL_REG); |
| @@ -606,6 +609,9 @@ static int rnandc_write_page_hw_ecc(stru |
| /* Configure DMA */ |
| dma_addr = dma_map_single(rnandc->dev, (void *)rnandc->buf, mtd->writesize, |
| DMA_TO_DEVICE); |
| + if (dma_mapping_error(rnandc->dev, dma_addr)) |
| + return -ENOMEM; |
| + |
| writel(dma_addr, rnandc->regs + DMA_ADDR_LOW_REG); |
| writel(mtd->writesize, rnandc->regs + DMA_CNT_REG); |
| writel(DMA_TLVL_MAX, rnandc->regs + DMA_TLVL_REG); |