FAILED: patch "[PATCH] memory: samsung: exynos-srom: Fix of_iomap leak in" failed to apply to 5.4-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y
git checkout FETCH_HEAD
git cherry-pick -x 6744085079e785dae5f7a2239456135407c58b25
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025101607-discharge-haiku-4150@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 6744085079e785dae5f7a2239456135407c58b25 Mon Sep 17 00:00:00 2001
From: Zhen Ni <[email protected]>
Date: Wed, 6 Aug 2025 10:55:38 +0800
Subject: [PATCH] memory: samsung: exynos-srom: Fix of_iomap leak in
exynos_srom_probe
The of_platform_populate() call at the end of the function has a possible failure path, causing a resource leak.
Replace of_iomap() with devm_platform_ioremap_resource() to ensure automatic cleanup of srom->reg_base.
This issue was detected by smatch static analysis:drivers/memory/samsung/exynos-srom.c:155 exynos_srom_probe()warn:
'srom->reg_base' from of_iomap() not released on lines: 155.
drivers/memory/samsung/exynos-srom.c +4 -6
@@ -121,20 +121,18 @@ static int exynos_srom_probe(struct platform_device *pdev)return -ENOMEM ; srom->dev = dev; - srom->reg_base =of_iomap (np,0 ); -if (!srom->reg_base) { + srom->reg_base =devm_platform_ioremap_resource (pdev,0 ); +if (IS_ERR (srom->reg_base)) {dev_err (&pdev->dev,"iomap of exynos srom controller failed\n" ); -return -ENOMEM ; +return PTR_ERR (srom->reg_base); }platform_set_drvdata (pdev, srom); srom->reg_offset =exynos_srom_alloc_reg_dump (exynos_srom_offsets,ARRAY_SIZE (exynos_srom_offsets)); -if (!srom->reg_offset) { -iounmap (srom->reg_base); +if (!srom->reg_offset)return -ENOMEM ; - }for_each_child_of_node (np, child) {if (exynos_srom_configure_bank (srom, child)) {
Sasha Levin
maintainerPATCH 1/2 memory: samsung: exynos-srom: Correct alignment
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 90de1c75d8acd83e9a699b93153307a1e411ef3a ]
Align indentation with open parenthesis (or fix existing alignment).
Stable-dep-of: 6744085079e7 ("memory: samsung: exynos-srom: Fix of_iomap leak in exynos_srom_probe")
--- drivers/memory/samsung/exynos-srom.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/memory/samsung/exynos-srom.c +11 -11
@@ -47,9 +47,9 @@ struct exynos_srom {struct exynos_srom_reg_dump *reg_offset; }; -static struct exynos_srom_reg_dump *exynos_srom_alloc_reg_dump ( -const unsigned long *rdump, -unsigned long nr_rdump) +static struct exynos_srom_reg_dump * +exynos_srom_alloc_reg_dump (const unsigned long *rdump, +unsigned long nr_rdump) {struct exynos_srom_reg_dump *rd;unsigned int i;
@@ -116,7 +116,7 @@ static int exynos_srom_probe(struct platform_device *pdev) } srom =devm_kzalloc (&pdev->dev, -sizeof (struct exynos_srom ),GFP_KERNEL ); +sizeof (struct exynos_srom ),GFP_KERNEL );if (!srom)return -ENOMEM ;
@@ -130,7 +130,7 @@ static int exynos_srom_probe(struct platform_device *pdev)platform_set_drvdata (pdev, srom); srom->reg_offset =exynos_srom_alloc_reg_dump (exynos_srom_offsets, -ARRAY_SIZE (exynos_srom_offsets)); +ARRAY_SIZE (exynos_srom_offsets));if (!srom->reg_offset) {iounmap (srom->reg_base);return -ENOMEM ;
@@ -157,16 +157,16 @@ static int exynos_srom_probe(struct platform_device *pdev)#ifdef CONFIG_PM_SLEEP static void exynos_srom_save (void __iomem *base, -struct exynos_srom_reg_dump *rd, -unsigned int num_regs) +struct exynos_srom_reg_dump *rd, +unsigned int num_regs) {for (; num_regs >0 ; --num_regs, ++rd) rd->value =readl (base + rd->offset); }static void exynos_srom_restore (void __iomem *base, -const struct exynos_srom_reg_dump *rd, -unsigned int num_regs) +const struct exynos_srom_reg_dump *rd, +unsigned int num_regs) {for (; num_regs >0 ; --num_regs, ++rd)writel (rd->value, base + rd->offset);
@@ -177,7 +177,7 @@ static int exynos_srom_suspend(struct device *dev)struct exynos_srom *srom =dev_get_drvdata (dev);exynos_srom_save (srom->reg_base, srom->reg_offset, -ARRAY_SIZE (exynos_srom_offsets)); +ARRAY_SIZE (exynos_srom_offsets));return 0 ; }
@@ -186,7 +186,7 @@ static int exynos_srom_resume(struct device *dev)struct exynos_srom *srom =dev_get_drvdata (dev);exynos_srom_restore (srom->reg_base, srom->reg_offset, -ARRAY_SIZE (exynos_srom_offsets)); +ARRAY_SIZE (exynos_srom_offsets)); return 0; }#endif
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 2/2 memory: samsung: exynos-srom: Fix of_iomap leak in exynos_srom_probe
From: Zhen Ni <[email protected]>
[ Upstream commit 6744085079e785dae5f7a2239456135407c58b25 ]
The of_platform_populate() call at the end of the function has a possible failure path, causing a resource leak.
Replace of_iomap() with devm_platform_ioremap_resource() to ensure automatic cleanup of srom->reg_base.
This issue was detected by smatch static analysis:drivers/memory/samsung/exynos-srom.c:155 exynos_srom_probe()warn:
'srom->reg_base' from of_iomap() not released on lines: 155.
--- drivers/memory/samsung/exynos-srom.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/memory/samsung/exynos-srom.c +4 -6
@@ -121,20 +121,18 @@ static int exynos_srom_probe(struct platform_device *pdev)return -ENOMEM ; srom->dev = dev; - srom->reg_base =of_iomap (np,0 ); -if (!srom->reg_base) { + srom->reg_base =devm_platform_ioremap_resource (pdev,0 ); +if (IS_ERR (srom->reg_base)) {dev_err (&pdev->dev,"iomap of exynos srom controller failed\n" ); -return -ENOMEM ; +return PTR_ERR (srom->reg_base); }platform_set_drvdata (pdev, srom); srom->reg_offset =exynos_srom_alloc_reg_dump (exynos_srom_offsets,ARRAY_SIZE (exynos_srom_offsets)); -if (!srom->reg_offset) { -iounmap (srom->reg_base); +if (!srom->reg_offset)return -ENOMEM ; - }for_each_child_of_node (np, child) {if (exynos_srom_configure_bank (srom, child)) {
Signature · 1 line
2.51.0