From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752245AbbBIFgO (ORCPT ); Mon, 9 Feb 2015 00:36:14 -0500 Received: from mga01.intel.com ([192.55.52.88]:52855 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751101AbbBIFgM (ORCPT ); Mon, 9 Feb 2015 00:36:12 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.09,541,1418112000"; d="scan'208";a="524597682" Message-ID: <54D84747.10501@linux.intel.com> Date: Mon, 09 Feb 2015 13:36:07 +0800 From: Jiang Liu Organization: Intel User-Agent: Mozilla/5.0 (Windows NT 6.2; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: "Rafael J. Wysocki" CC: Stephen Rothwell , Bjorn Helgaas , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Lorenzo Pieralisi Subject: Re: linux-next: build failure after merge of the pm tree References: <20150209132642.0d61b6ed@canb.auug.org.au> <54D82111.9090003@linux.intel.com> <2611810.oabrJWIJSx@vostro.rjw.lan> In-Reply-To: <2611810.oabrJWIJSx@vostro.rjw.lan> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Rafael and Lorenzo, With more closer review, I suspect statement "kfree(bus_range)" in commit d2be00c0fb5a ("of/pci: Free resources on failure in of_pci_get_host_bridge_resources()") may cause double free of bus_range because bus_range will also be freed by kfree(window->res); Regards! Gerry On 2015/2/9 11:22, Rafael J. Wysocki wrote: > On Monday, February 09, 2015 10:53:05 AM Jiang Liu wrote: >> >> On 2015/2/9 10:26, Stephen Rothwell wrote: >>> Hi Rafael, > > [cut] > >>> ^ >>> >>> Caused by commit 14d76b68f281 ("PCI: Use common resource list >>> management code instead of private implementation") interacting with >>> commit d2be00c0fb5a ("of/pci: Free resources on failure in >>> of_pci_get_host_bridge_resources()") from the pci tree. >>> >>> I applied the following merge fix patch (which may need more work?). >> Hi Stephen, >> Thanks for fixing it and there should no more work needed. > > Can you please have a look at my linux-next branch now and see if the code > is correct in there as well? > > Rafael >