From patchwork Wed Jun 4 22:49:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 356125 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B3A42140091 for ; Thu, 5 Jun 2014 08:50:31 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751466AbaFDWuG (ORCPT ); Wed, 4 Jun 2014 18:50:06 -0400 Received: from mail-pb0-f41.google.com ([209.85.160.41]:44261 "EHLO mail-pb0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751309AbaFDWuD (ORCPT ); Wed, 4 Jun 2014 18:50:03 -0400 Received: by mail-pb0-f41.google.com with SMTP id uo5so164218pbc.0 for ; Wed, 04 Jun 2014 15:50:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=w/6WVaNFP8CF4t4Fl8JpMU7+SyQo9y3QcRqP65LQ71k=; b=MyyUwqiSTLXApevk6U26sQGoV7h6QM+HsT4VlR4xBKALErNDQotcWhzDVCO0vBReX/ p7s4XyZTQRRr/KIqmOS9NmGEiBimjLQBbQXACtQpxOKr7/Fb87XoW0yvPfPSZQpzw0jo 95Y4XkdajBBgVRwIqpOqOh7CeA2YBsOjGnshhJp/PvZ7j1tGKWVpdm0Ia7CevokYw3FA xQ9YUvijniqbRokDwUSYXrwTpgVTARmoL9gcrSo6wPZK4mPdT/bBH1AdGaab8v2I9qxa Ly3d/srhuittGs7q9UbzNSaBOP/ak2QlMgKnNTaWwDlf/rK7ff6BCtK3ykQTHp9HGFLZ iPPw== X-Gm-Message-State: ALoCoQm0mjrQLnhpepZtZhRTJpjA8Fn2aXmkPdBLsJQmP5FS7xP4no4Skq5WwvRL2AsFKAq2HA60 X-Received: by 10.68.242.135 with SMTP id wq7mr68980083pbc.147.1401922202844; Wed, 04 Jun 2014 15:50:02 -0700 (PDT) Received: from pg-vmw-gw1.plumgrid.com ([67.21.3.149]) by mx.google.com with ESMTPSA id xk3sm14589659pbb.65.2014.06.04.15.50.00 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 04 Jun 2014 15:50:02 -0700 (PDT) From: Alexei Starovoitov To: Greg Kroah-Hartman Cc: Bjorn Helgaas , Neil Horman , "David S. Miller" , linux-pci@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] pci/msi: fix memory leak in free_msi_irqs() Date: Wed, 4 Jun 2014 15:49:50 -0700 Message-Id: <1401922190-25357-1-git-send-email-ast@plumgrid.com> X-Mailer: git-send-email 1.7.9.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org free_msi_irqs() is leaking memory, since list_for_each_entry(entry, &dev->msi_list, list) {...} is never executed, because dev->msi_list is made empty by the loop just above this one. Fix it by relying on zero termination of attribute array like populate_msi_sysfs() does. Fixes: 1c51b50c2995 ("PCI/MSI: Export MSI mode using attributes, not kobjects") Signed-off-by: Alexei Starovoitov Acked-by: Neil Horman Acked-by: Greg Kroah-Hartman --- This was found by kmemleak report: unreferenced object 0xffff880808eda600 (size 64): comm "modprobe", pid 1526, jiffies 4294902299 (age 58422.716s) hex dump (first 32 bytes): 20 c4 66 09 08 88 ff ff 24 01 00 00 00 00 00 00 .f.....$....... 50 97 77 82 ff ff ff ff 00 00 00 00 00 00 00 00 P.w............. backtrace: [] kmemleak_alloc+0x28/0x50 [] kmem_cache_alloc_trace+0xde/0x230 [] populate_msi_sysfs+0xc6/0x250 [] pci_enable_msix+0x34b/0x430 [] pci_enable_msix_range+0x2c/0x70 [] igb_init_interrupt_scheme+0x9e/0x420 [igb] [] igb_probe+0x4a8/0x1250 [igb] [] local_pci_probe+0x4e/0xa0 [] pci_device_probe+0xd9/0x120 [] driver_probe_device+0x8d/0x250 [] __driver_attach+0xab/0xb0 [] bus_for_each_dev+0x5d/0xa0 [] driver_attach+0x1e/0x20 [] bus_add_driver+0x117/0x220 [] driver_register+0x64/0xf0 [] __pci_register_driver+0x64/0x70 IGB driver is calling pci_enable_msix_range() and immediately pci_disable_msix() which leaks the memory. Obviously the leak happens with any driver. drivers/pci/msi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 955ab7990c5b..fb02fc2fb034 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -414,7 +414,7 @@ static void free_msi_irqs(struct pci_dev *dev) if (dev->msi_irq_groups) { sysfs_remove_groups(&dev->dev.kobj, dev->msi_irq_groups); msi_attrs = dev->msi_irq_groups[0]->attrs; - list_for_each_entry(entry, &dev->msi_list, list) { + while (msi_attrs[count]) { dev_attr = container_of(msi_attrs[count], struct device_attribute, attr); kfree(dev_attr->attr.name);