]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.10-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 10 Mar 2025 14:56:26 +0000 (15:56 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 10 Mar 2025 14:56:26 +0000 (15:56 +0100)
added patches:
mtd-rawnand-cadence-fix-unchecked-dereference.patch

queue-5.10/mtd-rawnand-cadence-fix-unchecked-dereference.patch [new file with mode: 0644]

diff --git a/queue-5.10/mtd-rawnand-cadence-fix-unchecked-dereference.patch b/queue-5.10/mtd-rawnand-cadence-fix-unchecked-dereference.patch
new file mode 100644 (file)
index 0000000..1460e16
--- /dev/null
@@ -0,0 +1,36 @@
+From 60255f3704fde70ed3c4d62f919aa4b46f841f70 Mon Sep 17 00:00:00 2001
+From: Niravkumar L Rabara <niravkumar.l.rabara@intel.com>
+Date: Sun, 16 Feb 2025 11:15:36 +0800
+Subject: mtd: rawnand: cadence: fix unchecked dereference
+
+From: Niravkumar L Rabara <niravkumar.l.rabara@intel.com>
+
+commit 60255f3704fde70ed3c4d62f919aa4b46f841f70 upstream.
+
+Add NULL check before variable dereference to fix static checker warning.
+
+Fixes: d76d22b5096c ("mtd: rawnand: cadence: use dma_map_resource for sdma address")
+Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
+Closes: https://lore.kernel.org/all/e448a22c-bada-448d-9167-7af71305130d@stanley.mountain/
+Signed-off-by: Niravkumar L Rabara <niravkumar.l.rabara@intel.com>
+Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/mtd/nand/raw/cadence-nand-controller.c |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/drivers/mtd/nand/raw/cadence-nand-controller.c
++++ b/drivers/mtd/nand/raw/cadence-nand-controller.c
+@@ -2934,8 +2934,10 @@ free_buf_desc:
+ static void cadence_nand_remove(struct cdns_nand_ctrl *cdns_ctrl)
+ {
+       cadence_nand_chips_cleanup(cdns_ctrl);
+-      dma_unmap_resource(cdns_ctrl->dmac->device->dev, cdns_ctrl->io.iova_dma,
+-                         cdns_ctrl->io.size, DMA_BIDIRECTIONAL, 0);
++      if (cdns_ctrl->dmac)
++              dma_unmap_resource(cdns_ctrl->dmac->device->dev,
++                                 cdns_ctrl->io.iova_dma, cdns_ctrl->io.size,
++                                 DMA_BIDIRECTIONAL, 0);
+       cadence_nand_irq_cleanup(cdns_ctrl->irq, cdns_ctrl);
+       kfree(cdns_ctrl->buf);
+       dma_free_coherent(cdns_ctrl->dev, sizeof(struct cadence_nand_cdma_desc),