From: Greg Kroah-Hartman Date: Mon, 10 Mar 2025 14:56:26 +0000 (+0100) Subject: 5.10-stable patches X-Git-Tag: v5.4.291~44 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b962a1d44cdbb8717bdb9b0d224876281c38b094;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: mtd-rawnand-cadence-fix-unchecked-dereference.patch --- 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 index 0000000000..1460e16899 --- /dev/null +++ b/queue-5.10/mtd-rawnand-cadence-fix-unchecked-dereference.patch @@ -0,0 +1,36 @@ +From 60255f3704fde70ed3c4d62f919aa4b46f841f70 Mon Sep 17 00:00:00 2001 +From: Niravkumar L Rabara +Date: Sun, 16 Feb 2025 11:15:36 +0800 +Subject: mtd: rawnand: cadence: fix unchecked dereference + +From: Niravkumar L Rabara + +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 +Closes: https://lore.kernel.org/all/e448a22c-bada-448d-9167-7af71305130d@stanley.mountain/ +Signed-off-by: Niravkumar L Rabara +Signed-off-by: Miquel Raynal +Signed-off-by: Greg Kroah-Hartman +--- + 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),