On Mon, Apr 27, 2015 at 10:35:34PM +0200, Julia Lawall wrote:
> From: Julia Lawall <Julia.Lawall@xxxxxxx>
>
> If the null test is needed, the call to cancel_delayed_work_sync would have
> already crashed. Normally, the destroy function should only be called
> if the init functoin has succeeded, in which case ioapic is not null.
>
> Problem found using Coccinelle.
>
> Signed-off-by: Julia Lawall <Julia.Lawall@xxxxxxx>
Acked-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
>
> ---
> arch/x86/kvm/ioapic.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/arch/x86/kvm/ioapic.c b2/arch/x86/kvm/ioapic.c
> index 28146f0..09828e2 100644
> --- a/arch/x86/kvm/ioapic.c
> +++ b2/arch/x86/kvm/ioapic.c
> @@ -637,11 +637,9 @@ void kvm_ioapic_destroy(struct kvm *kvm)
> struct kvm_ioapic *ioapic = kvm->arch.vioapic;
>
> cancel_delayed_work_sync(&ioapic->eoi_inject);
> - if (ioapic) {
> - kvm_io_bus_unregister_dev(kvm, KVM_MMIO_BUS, &ioapic->dev);
> - kvm->arch.vioapic = NULL;
> - kfree(ioapic);
> - }
> + kvm_io_bus_unregister_dev(kvm, KVM_MMIO_BUS, &ioapic->dev);
> + kvm->arch.vioapic = NULL;
> + kfree(ioapic);
> }
>
> int kvm_get_ioapic(struct kvm *kvm, struct kvm_ioapic_state *state)
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
