Messages in this thread Patch in this message | | | From | Shannon Zhao <> | Subject | [PATCH RFC 2/7] KVM: arch_timer: Fix resource leak on error path | Date | Thu, 24 Oct 2019 18:27:45 +0800 |
| |
It needs to cleanup irq setup for host_vtimer_irq when request_percpu_irq fails for host_ptimer_irq. It needs to cleanup irq setup for both host_vtimer_irq and host_ptimer_irq when seeting vcpu affinity error as well.
Fixes: 9e01dc76be6a ("KVM: arm/arm64: arch_timer: Assign the phys timer on VHE systems") Signed-off-by: Shannon Zhao <shannon.zhao@linux.alibaba.com> --- virt/kvm/arm/arch_timer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c index e2bb5bd..f5a5d51 100644 --- a/virt/kvm/arm/arch_timer.c +++ b/virt/kvm/arm/arch_timer.c @@ -960,7 +960,7 @@ int kvm_timer_hyp_init(bool has_gic) if (err) { kvm_err("kvm_arch_timer: can't request ptimer interrupt %d (%d)\n", host_ptimer_irq, err); - return err; + goto out_free_irq; } if (has_gic) { @@ -968,7 +968,7 @@ int kvm_timer_hyp_init(bool has_gic) kvm_get_running_vcpus()); if (err) { kvm_err("kvm_arch_timer: error setting vcpu affinity\n"); - goto out_free_irq; + goto out_free_pirq; } } @@ -984,6 +984,8 @@ int kvm_timer_hyp_init(bool has_gic) "kvm/arm/timer:starting", kvm_timer_starting_cpu, kvm_timer_dying_cpu); return 0; +out_free_pirq: + free_percpu_irq(host_ptimer_irq, kvm_get_running_vcpus()); out_free_irq: free_percpu_irq(host_vtimer_irq, kvm_get_running_vcpus()); return err; -- 1.8.3.1
| |