Commit 79e441ee authored by Thomas Fourier's avatar Thomas Fourier Committed by Miquel Raynal
Browse files

mtd: rawnand: renesas: Add missing check after DMA map 



The DMA map functions can fail and should be tested for errors.

Fixes: d8701fe8 ("mtd: rawnand: renesas: Add new NAND controller driver")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarThomas Fourier <fourier.thomas@gmail.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent fdfb040d

drivers/mtd/nand/raw/renesas-nand-controller.c

+6 −0
Original line number Diff line number Diff line
@@ -426,6 +426,9 @@ static int rnandc_read_page_hw_ecc(struct nand_chip *chip, u8 *buf, 
	/* 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(struct nand_chip *chip, const u8 *buf, 
	/* 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);