From: Sasha Levin Date: Sun, 18 Sep 2022 23:55:46 +0000 (-0400) Subject: Fixes for 4.19 X-Git-Tag: v4.9.329~10 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f3c51cfb2f67a6d51bfb7e15582fd685c1dba4a;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.19 Signed-off-by: Sasha Levin --- diff --git a/queue-4.19/parisc-ccio-dma-add-missing-iounmap-in-error-path-in.patch b/queue-4.19/parisc-ccio-dma-add-missing-iounmap-in-error-path-in.patch new file mode 100644 index 00000000000..15adc34b410 --- /dev/null +++ b/queue-4.19/parisc-ccio-dma-add-missing-iounmap-in-error-path-in.patch @@ -0,0 +1,35 @@ +From d62cb493a47629e9a64a9466847c616437c699fc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +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 + +[ 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 +Signed-off-by: Helge Deller +Signed-off-by: Sasha Levin +--- + 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 73ee74d6e7a3..2c763f9d75df 100644 +--- a/drivers/parisc/ccio-dma.c ++++ b/drivers/parisc/ccio-dma.c +@@ -1555,6 +1555,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.19/series b/queue-4.19/series index d3572d81201..bd074682a20 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -12,3 +12,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