From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933062AbeCSJY5 (ORCPT ); Mon, 19 Mar 2018 05:24:57 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:60350 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932891AbeCSJUe (ORCPT ); Mon, 19 Mar 2018 05:20:34 -0400 From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, marc.zyngier@arm.com, cdall@kernel.org, peter.maydell@linaro.org Cc: andre.przywara@arm.com, drjones@redhat.com, wei@redhat.com Subject: [RFC 01/12] KVM: arm/arm64: Avoid multiple dist->spis kfree Date: Mon, 19 Mar 2018 10:20:09 +0100 Message-Id: <1521451220-27754-2-git-send-email-eric.auger@redhat.com> In-Reply-To: <1521451220-27754-1-git-send-email-eric.auger@redhat.com> References: <1521451220-27754-1-git-send-email-eric.auger@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org in case kvm_vgic_map_resources() fails, typically if the vgic distributor is not defined, __kvm_vgic_destroy will be called several times. Indeed kvm_vgic_map_resources() is called on first vcpu run. As a result dist->spis is freeed twice and on the second time it causes a "kernel BUG at mm/slub.c:3912!" This patch avoids freeing dist->spis twice. Signed-off-by: Eric Auger --- virt/kvm/arm/vgic/vgic-init.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt/kvm/arm/vgic/vgic-init.c b/virt/kvm/arm/vgic/vgic-init.c index 743ca5c..38fd5f1 100644 --- a/virt/kvm/arm/vgic/vgic-init.c +++ b/virt/kvm/arm/vgic/vgic-init.c @@ -324,7 +324,10 @@ static void kvm_vgic_dist_destroy(struct kvm *kvm) dist->ready = false; dist->initialized = false; - kfree(dist->spis); + if (dist->spis) { + kfree(dist->spis); + dist->spis = NULL; + } dist->nr_spis = 0; if (vgic_supports_direct_msis(kvm)) -- 2.5.5