Linux-mtd Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/2] mtd: rawnand: cadence: Fix incorrect variable dereference
@ 2026-11-19 22:27 Miquel Raynal
  2026-11-19 22:27 ` [PATCH 1/2] mtd: rawnand: cadence: Fix DMA device dereference when DMA is disabled Miquel Raynal
  2026-11-19 22:27 ` [PATCH 2/2] mtd: rawnand: cadence: Switch to dmaengine_get_dma_device() Miquel Raynal
  0 siblings, 2 replies; 4+ messages in thread
From: Miquel Raynal @ 2026-11-19 22:27 UTC (permalink / raw)
  To: Richard Weinberger, Vignesh Raghavendra, Niravkumar L Rabara
  Cc: Thomas Petazzoni, linux-mtd, linux-kernel, Miquel Raynal,
	kernel test robot, Dan Carpenter, stable

Small series fixing a report dating from September on the Cadence
controller. Patch 2 uses a newer API for one of the DMA helpers.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
---
Miquel Raynal (2):
      mtd: rawnand: cadence: Fix DMA device dereference when DMA is disabled
      mtd: rawnand: cadence: Switch to dmaengine_get_dma_device()

 drivers/mtd/nand/raw/cadence-nand-controller.c | 27 ++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)
---
base-commit: 7475ea8b58616b33c04afb976cf0fbaad9dd63fb
change-id: 20261119-perso-upstreaming-rawnand-fixes-fb73bd596d1c

Best regards,
-- 
Miquel Raynal <miquel.raynal@bootlin.com>


______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 1/2] mtd: rawnand: cadence: Fix DMA device dereference when DMA is disabled
  2026-11-19 22:27 [PATCH 0/2] mtd: rawnand: cadence: Fix incorrect variable dereference Miquel Raynal
@ 2026-11-19 22:27 ` Miquel Raynal
  2026-11-19 22:27 ` [PATCH 2/2] mtd: rawnand: cadence: Switch to dmaengine_get_dma_device() Miquel Raynal
  1 sibling, 0 replies; 4+ messages in thread
From: Miquel Raynal @ 2026-11-19 22:27 UTC (permalink / raw)
  To: Richard Weinberger, Vignesh Raghavendra, Niravkumar L Rabara
  Cc: Thomas Petazzoni, linux-mtd, linux-kernel, Miquel Raynal,
	kernel test robot, Dan Carpenter, stable

Move the DMA resource mapping into the has_dma branch and only unmap the
resource when a DMA channel was actually acquired.

Fixes: 5c56bf214af8 ("mtd: rawnand: cadence: fix DMA device NULL pointer dereference")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/all/202603252339.fQzI6oc8-lkp@intel.com/
Reported-by: Dan Carpenter <error27@gmail.com>
Closes: https://lore.kernel.org/all/202609010758.3N8tYZdG-lkp@intel.com/
Cc: stable@vger.kernel.org
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
---
 drivers/mtd/nand/raw/cadence-nand-controller.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/drivers/mtd/nand/raw/cadence-nand-controller.c b/drivers/mtd/nand/raw/cadence-nand-controller.c
index e19ceb2d5dfc..42cc62b36457 100644
--- a/drivers/mtd/nand/raw/cadence-nand-controller.c
+++ b/drivers/mtd/nand/raw/cadence-nand-controller.c
@@ -3168,17 +3168,17 @@ static int cadence_nand_init(struct cdns_nand_ctrl *cdns_ctrl)
 					    "%d: Failed to get a DMA channel\n", ret);
 			goto disable_irq;
 		}
-	}
 
-	dma_dev = cdns_ctrl->dmac->device;
-	cdns_ctrl->io.iova_dma = dma_map_resource(dma_dev->dev, cdns_ctrl->io.dma,
-						  cdns_ctrl->io.size,
-						  DMA_BIDIRECTIONAL, 0);
+		dma_dev = cdns_ctrl->dmac->device;
+		cdns_ctrl->io.iova_dma = dma_map_resource(dma_dev->dev, cdns_ctrl->io.dma,
+							  cdns_ctrl->io.size,
+							  DMA_BIDIRECTIONAL, 0);
 
-	ret = dma_mapping_error(dma_dev->dev, cdns_ctrl->io.iova_dma);
-	if (ret) {
-		dev_err(cdns_ctrl->dev, "Failed to map I/O resource to DMA\n");
-		goto dma_release_chnl;
+		ret = dma_mapping_error(dma_dev->dev, cdns_ctrl->io.iova_dma);
+		if (ret) {
+			dev_err(cdns_ctrl->dev, "Failed to map I/O resource to DMA\n");
+			goto dma_release_chnl;
+		}
 	}
 
 	nand_controller_init(&cdns_ctrl->controller);
@@ -3204,8 +3204,9 @@ static int cadence_nand_init(struct cdns_nand_ctrl *cdns_ctrl)
 	return 0;
 
 unmap_dma_resource:
-	dma_unmap_resource(dma_dev->dev, cdns_ctrl->io.iova_dma,
-			   cdns_ctrl->io.size, DMA_BIDIRECTIONAL, 0);
+	if (cdns_ctrl->dmac)
+		dma_unmap_resource(dma_dev->dev, cdns_ctrl->io.iova_dma,
+				   cdns_ctrl->io.size, DMA_BIDIRECTIONAL, 0);
 
 dma_release_chnl:
 	if (cdns_ctrl->dmac)

-- 
2.56.0


______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 2/2] mtd: rawnand: cadence: Switch to dmaengine_get_dma_device()
  2026-11-19 22:27 [PATCH 0/2] mtd: rawnand: cadence: Fix incorrect variable dereference Miquel Raynal
  2026-11-19 22:27 ` [PATCH 1/2] mtd: rawnand: cadence: Fix DMA device dereference when DMA is disabled Miquel Raynal
@ 2026-11-19 22:27 ` Miquel Raynal
  2026-11-19 22:37   ` sashiko-bot
  1 sibling, 1 reply; 4+ messages in thread
From: Miquel Raynal @ 2026-11-19 22:27 UTC (permalink / raw)
  To: Richard Weinberger, Vignesh Raghavendra, Niravkumar L Rabara
  Cc: Thomas Petazzoni, linux-mtd, linux-kernel, Miquel Raynal

Use the dmaengine consumer accessor instead of open-coding it (as
already done in the remove path).

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
---
 drivers/mtd/nand/raw/cadence-nand-controller.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/mtd/nand/raw/cadence-nand-controller.c b/drivers/mtd/nand/raw/cadence-nand-controller.c
index 42cc62b36457..2ab59ec6e732 100644
--- a/drivers/mtd/nand/raw/cadence-nand-controller.c
+++ b/drivers/mtd/nand/raw/cadence-nand-controller.c
@@ -3126,7 +3126,6 @@ cadence_nand_irq_cleanup(int irqnum, struct cdns_nand_ctrl *cdns_ctrl)
 static int cadence_nand_init(struct cdns_nand_ctrl *cdns_ctrl)
 {
 	dma_cap_mask_t mask;
-	struct dma_device *dma_dev;
 	int ret;
 
 	cdns_ctrl->cdma_desc = dma_alloc_coherent(cdns_ctrl->dev,
@@ -3162,6 +3161,8 @@ static int cadence_nand_init(struct cdns_nand_ctrl *cdns_ctrl)
 	dma_cap_set(DMA_MEMCPY, mask);
 
 	if (cdns_ctrl->caps1->has_dma) {
+		struct device *dma_dev;
+
 		cdns_ctrl->dmac = dma_request_chan_by_mask(&mask);
 		if (IS_ERR(cdns_ctrl->dmac)) {
 			ret = dev_err_probe(cdns_ctrl->dev, PTR_ERR(cdns_ctrl->dmac),
@@ -3169,12 +3170,12 @@ static int cadence_nand_init(struct cdns_nand_ctrl *cdns_ctrl)
 			goto disable_irq;
 		}
 
-		dma_dev = cdns_ctrl->dmac->device;
-		cdns_ctrl->io.iova_dma = dma_map_resource(dma_dev->dev, cdns_ctrl->io.dma,
+		dma_dev = dmaengine_get_dma_device(cdns_ctrl->dmac);
+		cdns_ctrl->io.iova_dma = dma_map_resource(dma_dev, cdns_ctrl->io.dma,
 							  cdns_ctrl->io.size,
 							  DMA_BIDIRECTIONAL, 0);
 
-		ret = dma_mapping_error(dma_dev->dev, cdns_ctrl->io.iova_dma);
+		ret = dma_mapping_error(dma_dev, cdns_ctrl->io.iova_dma);
 		if (ret) {
 			dev_err(cdns_ctrl->dev, "Failed to map I/O resource to DMA\n");
 			goto dma_release_chnl;
@@ -3205,8 +3206,9 @@ static int cadence_nand_init(struct cdns_nand_ctrl *cdns_ctrl)
 
 unmap_dma_resource:
 	if (cdns_ctrl->dmac)
-		dma_unmap_resource(dma_dev->dev, cdns_ctrl->io.iova_dma,
-				   cdns_ctrl->io.size, DMA_BIDIRECTIONAL, 0);
+		dma_unmap_resource(dmaengine_get_dma_device(cdns_ctrl->dmac),
+				   cdns_ctrl->io.iova_dma, cdns_ctrl->io.size,
+				   DMA_BIDIRECTIONAL, 0);
 
 dma_release_chnl:
 	if (cdns_ctrl->dmac)

-- 
2.56.0


______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 2/2] mtd: rawnand: cadence: Switch to dmaengine_get_dma_device()
  2026-11-19 22:27 ` [PATCH 2/2] mtd: rawnand: cadence: Switch to dmaengine_get_dma_device() Miquel Raynal
@ 2026-11-19 22:37   ` sashiko-bot
  0 siblings, 0 replies; 4+ messages in thread
From: sashiko-bot @ 2026-11-19 22:37 UTC (permalink / raw)
  To: Miquel Raynal, Richard Weinberger, Vignesh Raghavendra,
	Niravkumar L Rabara
  Cc: Thomas Petazzoni, linux-mtd

Thank you for your contribution! Sashiko AI review found 1 potential
issue to consider:
- [Medium] mtd: rawnand: cadence: DMA device mismatch in
  cadence_nand_slave_dma_transfer()
It also noticed 1 related pre-existing issue this patch does not
introduce:
- [High] mtd: rawnand: cadence: heap buffer overflow in
  cadence_nand_attach_chip() [1]
--

commit c9efdaa390c8c64b9c5264e642be970afe9a5044
Author: Miquel Raynal <miquel.raynal@bootlin.com>

mtd: rawnand: cadence: Switch to dmaengine_get_dma_device()

This commit replaces direct accesses to cdns_ctrl->dmac->device->dev in
cadence_nand_init() with dmaengine_get_dma_device().

> diff --git a/drivers/mtd/nand/raw/cadence-nand-controller.c b/drivers/mtd/nand/raw/cadence-nand-controller.c
> index 42cc62b36457a..2ab59ec6e732e 100644
> --- a/drivers/mtd/nand/raw/cadence-nand-controller.c
> +++ b/drivers/mtd/nand/raw/cadence-nand-controller.c
> @@ -3126,7 +3126,6 @@ cadence_nand_irq_cleanup(int irqnum, struct cdns_nand_ctrl *cdns_ctrl)
>  static int cadence_nand_init(struct cdns_nand_ctrl *cdns_ctrl)
>  {
>  	dma_cap_mask_t mask;
> -	struct dma_device *dma_dev;
>  	int ret;
>  
>  	cdns_ctrl->cdma_desc = dma_alloc_coherent(cdns_ctrl->dev,

[Severity: High]
This problem wasn't introduced by this patch, but can [1] overflow
cdns_ctrl->buf during cadence_nand_chips_init()?

cadence_nand_init() initially allocates cdns_ctrl->buf at 16 KiB and only
reallocates it to cdns_ctrl->buf_size after cadence_nand_chips_init()
returns.  When a NAND chip's writesize + oobsize exceeds 16 KiB,
cadence_nand_attach_chip() updates cdns_ctrl->buf_size without resizing
cdns_ctrl->buf, and nand_scan_tail() -> nand_create_bbt() then performs
page and OOB transfers up to writesize + oobsize against the 16 KiB heap
buffer before cadence_nand_chips_init() finishes.

> @@ -3162,6 +3161,8 @@ static int cadence_nand_init(struct cdns_nand_ctrl *cdns_ctrl)
>  	dma_cap_set(DMA_MEMCPY, mask);
>  
>  	if (cdns_ctrl->caps1->has_dma) {
> +		struct device *dma_dev;
> +
>  		cdns_ctrl->dmac = dma_request_chan_by_mask(&mask);
>  		if (IS_ERR(cdns_ctrl->dmac)) {
>  			ret = dev_err_probe(cdns_ctrl->dev, PTR_ERR(cdns_ctrl->dmac),
> @@ -3169,12 +3170,12 @@ static int cadence_nand_init(struct cdns_nand_ctrl *cdns_ctrl)
>  			goto disable_irq;
>  		}
>  
> -		dma_dev = cdns_ctrl->dmac->device;
> -		cdns_ctrl->io.iova_dma = dma_map_resource(dma_dev->dev, cdns_ctrl->io.dma,
> +		dma_dev = dmaengine_get_dma_device(cdns_ctrl->dmac);
> +		cdns_ctrl->io.iova_dma = dma_map_resource(dma_dev, cdns_ctrl->io.dma,
>  							  cdns_ctrl->io.size,
>  							  DMA_BIDIRECTIONAL, 0);
>  
> -		ret = dma_mapping_error(dma_dev->dev, cdns_ctrl->io.iova_dma);
> +		ret = dma_mapping_error(dma_dev, cdns_ctrl->io.iova_dma);
>  		if (ret) {
>  			dev_err(cdns_ctrl->dev, "Failed to map I/O resource to DMA\n");
>  			goto dma_release_chnl;

[Severity: Medium]
Should cadence_nand_slave_dma_transfer() also use
dmaengine_get_dma_device() instead of chan->device->dev when mapping and
unmapping buf_dma?

drivers/mtd/nand/raw/cadence-nand-controller.c:cadence_nand_slave_dma_transfer() {
	...
	chan = cdns_ctrl->dmac;
	dma_dev = chan->device;

	buf_dma = dma_map_single(dma_dev->dev, buf, len, dir);
	...
}

cadence_nand_slave_dma_transfer() passes both cdns_ctrl->io.iova_dma and
buf_dma to dmaengine_prep_dma_memcpy() on the same channel.  On DMA
engines with per-channel DMA devices (chan_dma_dev),
dmaengine_get_dma_device() returns &chan->chan_dev->device rather than
chan->device->dev, so the two endpoints of the transfer would be mapped
against different struct devices.

[1] https://sashiko.dev/#/bug/linux-ee4810cc-1bf6-40ac-bdf0-e7cb10ace410

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20261119-perso-upstreaming-rawnand-fixes-v1-0-0c95641b550c@bootlin.com?part=2

______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2026-11-19 22:37 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-19 22:27 [PATCH 0/2] mtd: rawnand: cadence: Fix incorrect variable dereference Miquel Raynal
2026-11-19 22:27 ` [PATCH 1/2] mtd: rawnand: cadence: Fix DMA device dereference when DMA is disabled Miquel Raynal
2026-11-19 22:27 ` [PATCH 2/2] mtd: rawnand: cadence: Switch to dmaengine_get_dma_device() Miquel Raynal
2026-11-19 22:37   ` sashiko-bot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox