Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752244Ab3GACJl (ORCPT ); Sun, 30 Jun 2013 22:09:41 -0400 Received: from ozlabs.org ([203.10.76.45]:54535 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751729Ab3GACJk (ORCPT ); Sun, 30 Jun 2013 22:09:40 -0400 From: Rusty Russell To: Jason Wang , Andrey Vagin Cc: "Michael S. Tsirkin" , virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] virtio-pci: fix leaks of msix_affinity_masks In-Reply-To: <51C3F1BD.9050703@redhat.com> References: <20130619182809.GC15017@redhat.com> <1371706610-12028-1-git-send-email-avagin@openvz.org> <51C3F1BD.9050703@redhat.com> User-Agent: Notmuch/0.15.2+81~gd2c8818 (http://notmuchmail.org) Emacs/23.4.1 (i686-pc-linux-gnu) Date: Mon, 01 Jul 2013 09:13:44 +0930 Message-ID: <87sizztb9r.fsf@rustcorp.com.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3375 Lines: 86 Jason Wang writes: > On 06/20/2013 01:36 PM, Andrey Vagin wrote: >> From: Andrew Vagin >> >> vp_dev->msix_vectors should be initialized before allocating >> msix_affinity_masks, otherwise vp_free_vectors will not free these >> objects. >> >> unreferenced object 0xffff88010f969d88 (size 512): >> comm "systemd-udevd", pid 158, jiffies 4294673645 (age 80.545s) >> hex dump (first 32 bytes): >> 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ >> 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ >> backtrace: >> [] kmemleak_alloc+0x5e/0xc0 >> [] kmem_cache_alloc_node_trace+0x141/0x2c0 >> [] alloc_cpumask_var_node+0x23/0x80 >> [] alloc_cpumask_var+0xe/0x10 >> [] vp_try_to_find_vqs+0x25d/0x810 >> [] vp_find_vqs+0x81/0xb0 >> [] init_vqs+0x85/0x120 [virtio_balloon] >> [] virtballoon_probe+0xf9/0x1a0 [virtio_balloon] >> [] virtio_dev_probe+0xde/0x140 >> [] driver_probe_device+0x98/0x3a0 >> [] __driver_attach+0xab/0xb0 >> [] bus_for_each_dev+0x94/0xb0 >> [] driver_attach+0x1e/0x20 >> [] bus_add_driver+0x200/0x280 >> [] driver_register+0x74/0x160 >> [] register_virtio_driver+0x20/0x40 >> >> v2: change msix_vectors uncoditionaly in vp_free_vectors >> >> Cc: Rusty Russell >> Cc: "Michael S. Tsirkin" >> Cc: Jason Wang >> Signed-off-by: Andrew Vagin >> Signed-off-by: Andrey Vagin >> --- >> drivers/virtio/virtio_pci.c | 5 +++-- >> 1 file changed, 3 insertions(+), 2 deletions(-) Thanks, applied. Cheers, Rusty. >> >> diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c >> index a7ce730..1aba255 100644 >> --- a/drivers/virtio/virtio_pci.c >> +++ b/drivers/virtio/virtio_pci.c >> @@ -289,9 +289,9 @@ static void vp_free_vectors(struct virtio_device *vdev) >> >> pci_disable_msix(vp_dev->pci_dev); >> vp_dev->msix_enabled = 0; >> - vp_dev->msix_vectors = 0; >> } >> >> + vp_dev->msix_vectors = 0; >> vp_dev->msix_used_vectors = 0; >> kfree(vp_dev->msix_names); >> vp_dev->msix_names = NULL; >> @@ -309,6 +309,8 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors, >> unsigned i, v; >> int err = -ENOMEM; >> >> + vp_dev->msix_vectors = nvectors; >> + >> vp_dev->msix_entries = kmalloc(nvectors * sizeof *vp_dev->msix_entries, >> GFP_KERNEL); >> if (!vp_dev->msix_entries) >> @@ -336,7 +338,6 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors, >> err = -ENOSPC; >> if (err) >> goto error; >> - vp_dev->msix_vectors = nvectors; >> vp_dev->msix_enabled = 1; >> >> /* Set the vector used for configuration */ > Acked-by: Jason Wang -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/