Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07616f01 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-mach-fixes-4.2' of https://github.com/krzk/linux into fixes

Two fixes for bugs in Exynos power domain error exit path:
1. kfree() of read-only memory (name of power domain returned
   by kstrdup_const()),
2. Doubled of_node_put() leading to invalid ref count for OF node.

* tag 'samsung-mach-fixes-4.2' of https://github.com/krzk/linux

:
  ARM: EXYNOS: fix double of_node_put() on error path
  ARM: EXYNOS: Fix potentian kfree() of ro memory

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents e2e927c8 3e9f7987
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -146,9 +146,8 @@ static __init int exynos4_pm_init_power_domain(void)
		pd->base = of_iomap(np, 0);
		if (!pd->base) {
			pr_warn("%s: failed to map memory\n", __func__);
			kfree(pd->pd.name);
			kfree_const(pd->pd.name);
			kfree(pd);
			of_node_put(np);
			continue;
		}