* [PATCH] mtd: rawnand: renesas: Add missing check after DMA map
@ 2025-07-02 7:17 Thomas Fourier
2025-07-02 7:48 ` Miquel Raynal
0 siblings, 1 reply; 2+ messages in thread
From: Thomas Fourier @ 2025-07-02 7:17 UTC (permalink / raw)
Cc: Thomas Fourier, stable, Miquel Raynal, Richard Weinberger,
Vignesh Raghavendra, Wolfram Sang, linux-mtd, linux-renesas-soc,
linux-kernel
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>
---
drivers/mtd/nand/raw/renesas-nand-controller.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/mtd/nand/raw/renesas-nand-controller.c b/drivers/mtd/nand/raw/renesas-nand-controller.c
index 44f6603736d1..f4a775571733 100644
--- a/drivers/mtd/nand/raw/renesas-nand-controller.c
+++ b/drivers/mtd/nand/raw/renesas-nand-controller.c
@@ -426,6 +426,10 @@ 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)) {
+ dev_err(rnandc->dev, "DMA mapping failed.\n");
+ 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 +610,10 @@ 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)) {
+ dev_err(rnandc->dev, "DMA mapping failed.\n");
+ 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);
--
2.43.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] mtd: rawnand: renesas: Add missing check after DMA map
2025-07-02 7:17 [PATCH] mtd: rawnand: renesas: Add missing check after DMA map Thomas Fourier
@ 2025-07-02 7:48 ` Miquel Raynal
0 siblings, 0 replies; 2+ messages in thread
From: Miquel Raynal @ 2025-07-02 7:48 UTC (permalink / raw)
To: Thomas Fourier
Cc: stable, Richard Weinberger, Vignesh Raghavendra, Wolfram Sang,
linux-mtd, linux-renesas-soc, linux-kernel
Hi Thomas,
On 02/07/2025 at 09:17:22 +02, Thomas Fourier <fourier.thomas@gmail.com> wrote:
> 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>
> ---
> drivers/mtd/nand/raw/renesas-nand-controller.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/drivers/mtd/nand/raw/renesas-nand-controller.c b/drivers/mtd/nand/raw/renesas-nand-controller.c
> index 44f6603736d1..f4a775571733 100644
> --- a/drivers/mtd/nand/raw/renesas-nand-controller.c
> +++ b/drivers/mtd/nand/raw/renesas-nand-controller.c
> @@ -426,6 +426,10 @@ 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)) {
> + dev_err(rnandc->dev, "DMA mapping failed.\n");
This error message is not informative, please drop
it. dma_mapping_error() does give more information if you enable some
DMA DEBUG Kconfig symbol already.
> + 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 +610,10 @@ 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)) {
> + dev_err(rnandc->dev, "DMA mapping failed.\n");
Ditto.
> + 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);
Thanks,
Miquèl
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-07-02 7:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-07-02 7:17 [PATCH] mtd: rawnand: renesas: Add missing check after DMA map Thomas Fourier
2025-07-02 7:48 ` 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).