Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754068AbbBKWvE (ORCPT ); Wed, 11 Feb 2015 17:51:04 -0500 Received: from mail-oi0-f48.google.com ([209.85.218.48]:34106 "EHLO mail-oi0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753050AbbBKWvC (ORCPT ); Wed, 11 Feb 2015 17:51:02 -0500 Date: Wed, 11 Feb 2015 16:50:57 -0600 From: Bjorn Helgaas To: Lorenzo Pieralisi Cc: linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, jiang.liu@linux.intel.com, "Rafael J. Wysocki" Subject: Re: [PATCH] drivers: of: pci: remove duplicate kfree in of_pci_get_host_bridge_resources Message-ID: <20150211225057.GA16317@google.com> References: <1423630715-23568-1-git-send-email-lorenzo.pieralisi@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1423630715-23568-1-git-send-email-lorenzo.pieralisi@arm.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2058 Lines: 50 On Wed, Feb 11, 2015 at 04:58:35AM +0000, Lorenzo Pieralisi wrote: > Commit d2be00c0fb5a ("of/pci: Free resources on failure in > of_pci_get_host_bridge_resources()") fixed the error code path in > of_pci_get_host_bridge_resources() by adding code that runs through the > resources list to free all resources in it and then calls kfree on the > bus_range resource pointer to complete the memory deallocation. > Since the bus_range resource is added to the resources list through > pci_add_resource, the resource_list_for_each_entry loop in the error > exit path frees it already and freeing it anew could trigger a double > free, hence this patch removes the superfluos kfree call on the bus_range > resource. > > Fixes: d2be00c0fb5a ("of/pci: Free resources on failure in of_pci_get_host_bridge_resources()") > Signed-off-by: Lorenzo Pieralisi > Reported-by: Jiang Liu > Cc: Bjorn Helgaas > Cc: Rafael J. Wysocki I applied this to for-linus, and will ask Linus to put it in before v3.20-rc1, thanks! Rafael, I applied d2be00c0fb5a, where the bug originally came from, but I see that you fixed it with 5c493df25a0d and the fix got lost because of an incorrect merge resolution. So if you'd rather take this, just let me know. > --- > drivers/of/of_pci.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/of/of_pci.c b/drivers/of/of_pci.c > index 110fece..62426d8 100644 > --- a/drivers/of/of_pci.c > +++ b/drivers/of/of_pci.c > @@ -229,7 +229,6 @@ parse_failed: > resource_list_for_each_entry(window, resources) > kfree(window->res); > pci_free_resource_list(resources); > - kfree(bus_range); > return err; > } > EXPORT_SYMBOL_GPL(of_pci_get_host_bridge_resources); > -- > 2.2.1 > -- 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/