| Message ID | 1444119275-8972-1-git-send-email-p.fedin@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 10/06/2015 03:14 AM, Pavel Fedin wrote: > Jump to correct label and free kvm_host_cpu_state > > Signed-off-by: Pavel Fedin <p.fedin@samsung.com> > --- > arch/arm/kvm/arm.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c > index dc017ad..78b2869 100644 > --- a/arch/arm/kvm/arm.c > +++ b/arch/arm/kvm/arm.c > @@ -1080,7 +1080,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(); > kvm_host_cpu_state was allocated before kvm_timer_hyp_init() is called. So it needs to be freed when kvm_timer_hyp_init() fails. Reviewed-by: Wei Huang <wei@redhat.com> Thanks, -Wei -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Oct 06, 2015 at 11:14:35AM +0300, Pavel Fedin wrote: > Jump to correct label and free kvm_host_cpu_state > > Signed-off-by: Pavel Fedin <p.fedin@samsung.com> > --- > arch/arm/kvm/arm.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c > index dc017ad..78b2869 100644 > --- a/arch/arm/kvm/arm.c > +++ b/arch/arm/kvm/arm.c > @@ -1080,7 +1080,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(); Nice catch. Applied, thanks. -Christoffer -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index dc017ad..78b2869 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c @@ -1080,7 +1080,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();
Jump to correct label and free kvm_host_cpu_state Signed-off-by: Pavel Fedin <p.fedin@samsung.com> --- arch/arm/kvm/arm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)