aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Fedin <p.fedin@samsung.com>2015-10-06 11:14:35 +0300
committerAlex Shi <alex.shi@linaro.org>2016-05-24 22:39:31 +0800
commit611102be06dcc688887ab84d12a922a3c8072314 (patch)
tree5fa2a402265d68326b3a10c7314fccf454cfca50
parentf943cd9f551523521a877d0a9aabf415d2746845 (diff)
downloadlinux-linaro-stable-611102be06dcc688887ab84d12a922a3c8072314.tar.gz
KVM: arm/arm64: Fix memory leak if timer initialization fails
Jump to correct label and free kvm_host_cpu_state Reviewed-by: Wei Huang <wei@redhat.com> Signed-off-by: Pavel Fedin <p.fedin@samsung.com> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> (cherry picked from commit 399ea0f6bcd318af94ec8e4ffe96703ed674f22e) Signed-off-by: Alex Shi <alex.shi@linaro.org>
-rw-r--r--arch/arm/kvm/arm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index 529cb22..5aa449f 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -1091,7 +1091,7 @@ static int init_hyp_mode(void)
*/
err = kvm_timer_hyp_init();
if (err)
- goto out_free_mappings;
+ goto out_free_context;
#ifndef CONFIG_HOTPLUG_CPU
free_boot_hyp_pgd();