Fixes for 4.9

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

diff --git a/queue-4.9/parisc-ccio-dma-add-missing-iounmap-in-error-path-in.patch b/queue-4.9/parisc-ccio-dma-add-missing-iounmap-in-error-path-in.patch
new file mode 100644 (file)
index 0000000..4c58119
--- /dev/null
+++ b/queue-4.9/parisc-ccio-dma-add-missing-iounmap-in-error-path-in.patch
@@ -0,0 +1,35 @@
+From 889ce4d3d13d5ea4bd190d341984507164e8dcbd 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 633762f8d775..84a93ddcd57a 100644
+--- a/drivers/parisc/ccio-dma.c
++++ b/drivers/parisc/ccio-dma.c
+@@ -1569,6 +1569,7 @@ static int __init ccio_probe(struct parisc_device *dev)
+       ioc->ioc_regs = ioremap_nocache(dev->hpa.start, 4096);
+       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.9/series b/queue-4.9/series
index 127f39973f1c76d6909c148ea022e9ed455dc30a..bdf4b0ae5192e7c49304caef5373d2f8211ea468 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -5,3 +5,4 @@ ieee802154-cc2520-add-rc-code-in-cc2520_tx.patch
 platform-x86-acer-wmi-acer-aspire-one-aod270-packard.patch
 mm-fix-tlb-flush-for-not-first-pfnmap-mappings-in-unmap_region.patch
 tracefs-only-clobber-mode-uid-gid-on-remount-if-asked.patch
+parisc-ccio-dma-add-missing-iounmap-in-error-path-in.patch