From: Greg Kroah-Hartman Date: Wed, 1 Mar 2023 15:29:03 +0000 (+0100) Subject: 4.14-stable patches X-Git-Tag: v4.19.275~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f6c5be60aed3c145605deb8405761f13ecfcbaf7;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: dmaengine-sh-rcar-dmac-check-for-error-num-after-dma_set_max_seg_size.patch --- diff --git a/queue-4.14/dmaengine-sh-rcar-dmac-check-for-error-num-after-dma_set_max_seg_size.patch b/queue-4.14/dmaengine-sh-rcar-dmac-check-for-error-num-after-dma_set_max_seg_size.patch new file mode 100644 index 00000000000..152f4fa56f6 --- /dev/null +++ b/queue-4.14/dmaengine-sh-rcar-dmac-check-for-error-num-after-dma_set_max_seg_size.patch @@ -0,0 +1,38 @@ +From da2ad87fba0891576aadda9161b8505fde81a84d Mon Sep 17 00:00:00 2001 +From: Jiasheng Jiang +Date: Tue, 11 Jan 2022 09:12:39 +0800 +Subject: dmaengine: sh: rcar-dmac: Check for error num after dma_set_max_seg_size + +From: Jiasheng Jiang + +commit da2ad87fba0891576aadda9161b8505fde81a84d upstream. + +As the possible failure of the dma_set_max_seg_size(), it should be +better to check the return value of the dma_set_max_seg_size(). + +Fixes: 97d49c59e219 ("dmaengine: rcar-dmac: set scatter/gather max segment size") +Reported-by: Geert Uytterhoeven +Signed-off-by: Jiasheng Jiang +Reviewed-by: Geert Uytterhoeven +Link: https://lore.kernel.org/r/20220111011239.452837-1-jiasheng@iscas.ac.cn +Signed-off-by: Vinod Koul +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Nobuhiro Iwamatsu (CIP) +--- + drivers/dma/sh/rcar-dmac.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +--- a/drivers/dma/sh/rcar-dmac.c ++++ b/drivers/dma/sh/rcar-dmac.c +@@ -1766,7 +1766,10 @@ static int rcar_dmac_probe(struct platfo + dmac->dev = &pdev->dev; + platform_set_drvdata(pdev, dmac); + dmac->dev->dma_parms = &dmac->parms; +- dma_set_max_seg_size(dmac->dev, RCAR_DMATCR_MASK); ++ ret = dma_set_max_seg_size(dmac->dev, RCAR_DMATCR_MASK); ++ if (ret) ++ return ret; ++ + ret = dma_set_mask_and_coherent(dmac->dev, DMA_BIT_MASK(40)); + if (ret) + return ret; diff --git a/queue-4.14/series b/queue-4.14/series index af6e0ec69be..fd0a26c9336 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -6,3 +6,4 @@ bpf-do-not-use-ax-register-in-interpreter-on-div-mod.patch bpf-fix-subprog-verifier-bypass-by-div-mod-by-0-exception.patch bpf-fix-32-bit-src-register-truncation-on-div-mod.patch bpf-fix-truncation-handling-for-mod32-dst-reg-wrt-zero.patch +dmaengine-sh-rcar-dmac-check-for-error-num-after-dma_set_max_seg_size.patch