| From 09d12c3d55b08aa9f637ece7bc82ed812948979a Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 10 Nov 2020 21:07:52 -0500 |
| Subject: Revert "powerpc/pseries/hotplug-cpu: Remove double free in error |
| path" |
| |
| From: Zhang Xiaoxu <zhangxiaoxu5@huawei.com> |
| |
| [ Upstream commit a40fdaf1420d6e6bda0dd2df1e6806013e58dbe1 ] |
| |
| This reverts commit a0ff72f9f5a780341e7ff5e9ba50a0dad5fa1980. |
| |
| Since the commit b015f6bc9547 ("powerpc/pseries: Add cpu DLPAR |
| support for drc-info property"), the 'cpu_drcs' wouldn't be double |
| freed when the 'cpus' node not found. |
| |
| So we needn't apply this patch, otherwise, the memory will be leaked. |
| |
| Fixes: a0ff72f9f5a7 ("powerpc/pseries/hotplug-cpu: Remove double free in error path") |
| Reported-by: Hulk Robot <hulkci@huawei.com> |
| Signed-off-by: Zhang Xiaoxu <zhangxiaoxu5@huawei.com> |
| [mpe: Caused by me applying a patch to a function that had changed in the interim] |
| Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> |
| Link: https://lore.kernel.org/r/20201111020752.1686139-1-zhangxiaoxu5@huawei.com |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/powerpc/platforms/pseries/hotplug-cpu.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c |
| index a02012f1b04af..12cbffd3c2e32 100644 |
| --- a/arch/powerpc/platforms/pseries/hotplug-cpu.c |
| +++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c |
| @@ -746,6 +746,7 @@ static int dlpar_cpu_add_by_count(u32 cpus_to_add) |
| parent = of_find_node_by_path("/cpus"); |
| if (!parent) { |
| pr_warn("Could not find CPU root node in device tree\n"); |
| + kfree(cpu_drcs); |
| return -1; |
| } |
| |
| -- |
| 2.27.0 |
| |
