aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2015-08-13 12:18:45 +0200
committerOlof Johansson <olof@lixom.net>2015-08-13 12:18:45 +0200
commit07616f013b933a129b9e3be7779b63c85e26c399 (patch)
tree84dbc04c938ff8ffc439cc0b1b57ab272483e566
parente2e927c8238a84454d0f841a2adf14d4adb1e845 (diff)
parent3e9f798784b30293012682021d5a0352f78658b8 (diff)
downloadlinux-yocto-07616f013b933a129b9e3be7779b63c85e26c399.tar.gz
linux-yocto-07616f013b933a129b9e3be7779b63c85e26c399.tar.bz2
linux-yocto-07616f013b933a129b9e3be7779b63c85e26c399.zip
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: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/arm/mach-exynos/pm_domains.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-exynos/pm_domains.c b/arch/arm/mach-exynos/pm_domains.c
index 6001f1c9d136..4a87e86dec45 100644
--- a/arch/arm/mach-exynos/pm_domains.c
+++ b/arch/arm/mach-exynos/pm_domains.c
@@ -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;
}