From patchwork Wed May 27 21:37:39 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Haskins X-Patchwork-Id: 26630 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n4RMGveq015361 for ; Wed, 27 May 2009 22:16:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762194AbZE0WPp (ORCPT ); Wed, 27 May 2009 18:15:45 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932079AbZE0WPo (ORCPT ); Wed, 27 May 2009 18:15:44 -0400 Received: from victor.provo.novell.com ([137.65.250.26]:60767 "EHLO victor.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762234AbZE0WPg (ORCPT ); Wed, 27 May 2009 18:15:36 -0400 Received: from dev.haskins.net (prv-ext-foundry1.gns.novell.com [137.65.251.240]) by victor.provo.novell.com with ESMTP (TLS encrypted); Wed, 27 May 2009 16:15:32 -0600 Received: from dev.haskins.net (localhost [127.0.0.1]) by dev.haskins.net (Postfix) with ESMTP id A9E32464246; Wed, 27 May 2009 17:37:39 -0400 (EDT) From: Gregory Haskins Subject: [KVM PATCH v2 1/3] kvm: fix potential coalesced_mmio leak on shutdown To: avi@redhat.com Cc: chrisw@sous-sol.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Date: Wed, 27 May 2009 17:37:39 -0400 Message-ID: <20090527213739.24324.23034.stgit@dev.haskins.net> In-Reply-To: <20090527213535.24324.62362.stgit@dev.haskins.net> References: <20090527213535.24324.62362.stgit@dev.haskins.net> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org It would appear that we are invoking kfree() on the wrong pointer in the destructor for the coalesced_mmio device. This could result in a potential leak during shutdown. This works today because the kvm_io_device is the first element of the private structure, but this could change in the future, so lets clean this up. Signed-off-by: Gregory Haskins --- virt/kvm/coalesced_mmio.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) -- 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/virt/kvm/coalesced_mmio.c b/virt/kvm/coalesced_mmio.c index 5ae620d..03ea280 100644 --- a/virt/kvm/coalesced_mmio.c +++ b/virt/kvm/coalesced_mmio.c @@ -80,7 +80,10 @@ static void coalesced_mmio_write(struct kvm_io_device *this, static void coalesced_mmio_destructor(struct kvm_io_device *this) { - kfree(this); + struct kvm_coalesced_mmio_dev *dev = + (struct kvm_coalesced_mmio_dev *)this->private; + + kfree(dev); } int kvm_coalesced_mmio_init(struct kvm *kvm)