Fixes for 4.14

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.14/parisc-ccio-dma-add-missing-iounmap-in-error-path-in.patch b/queue-4.14/parisc-ccio-dma-add-missing-iounmap-in-error-path-in.patch
new file mode 100644 (file)
index 0000000..860ed1a
--- /dev/null
+++ b/queue-4.14/parisc-ccio-dma-add-missing-iounmap-in-error-path-in.patch
@@ -0,0 +1,35 @@
+From b2feba6ed16fc1bb6c2bc3195aa94f592c8a49d2 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Wed, 24 Aug 2022 17:36:57 +0800
+Subject: parisc: ccio-dma: Add missing iounmap in error path in ccio_probe()
+
+From: Yang Yingliang <yangyingliang@huawei.com>
+
+[ Upstream commit 38238be4e881a5d0abbe4872b4cd6ed790be06c8 ]
+
+Add missing iounmap() before return from ccio_probe(), if ccio_init_resources()
+fails.
+
+Fixes: d46c742f827f ("parisc: ccio-dma: Handle kmalloc failure in ccio_init_resources()")
+Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
+Signed-off-by: Helge Deller <deller@gmx.de>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/parisc/ccio-dma.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
+index cc23b30337c1..afae74a99df1 100644
+--- a/drivers/parisc/ccio-dma.c
++++ b/drivers/parisc/ccio-dma.c
+@@ -1581,6 +1581,7 @@ static int __init ccio_probe(struct parisc_device *dev)
+       }
+       ccio_ioc_init(ioc);
+       if (ccio_init_resources(ioc)) {
++              iounmap(ioc->ioc_regs);
+               kfree(ioc);
+               return -ENOMEM;
+       }
+-- 
+2.35.1
+

diff --git a/queue-4.14/series b/queue-4.14/series
index 48ddecb382dc687e3e4a86ead681cee659742a29..f997f534adc9587ad37e7830ea7a6fbf48d285d1 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -8,3 +8,4 @@ tracefs-only-clobber-mode-uid-gid-on-remount-if-asked.patch
 of-fdt-fix-off-by-one-error-in-unflatten_dt_nodes.patch
 gpio-mpc8xxx-fix-support-for-irq_type_level_low-flow.patch
 drm-meson-correct-osd1-global-alpha-value.patch
+parisc-ccio-dma-add-missing-iounmap-in-error-path-in.patch