Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933250AbbLGVds (ORCPT ); Mon, 7 Dec 2015 16:33:48 -0500 Received: from mga01.intel.com ([192.55.52.88]:4465 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933373AbbLGVch (ORCPT ); Mon, 7 Dec 2015 16:32:37 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,396,1444719600"; d="scan'208";a="866649093" From: Keith Busch To: LKML , x86@kernel.org, linux-pci@vger.kernel.org Cc: Jiang Liu , Thomas Gleixner , Dan Williams , Bjorn Helgaas , Bryan Veal , Ingo Molnar , "H. Peter Anvin" , Martin Mares , Jon Derrick , Keith Busch Subject: [PATCHv6 2/7] pci: child bus alloc fix on constrained resource Date: Mon, 7 Dec 2015 14:32:24 -0700 Message-Id: <1449523949-21898-3-git-send-email-keith.busch@intel.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1449523949-21898-1-git-send-email-keith.busch@intel.com> References: <1449523949-21898-1-git-send-email-keith.busch@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 985 Lines: 33 Does not allocate a child bus if the new bus number does not fit in the parent's bus resource window. Signed-off-by: Keith Busch --- drivers/pci/probe.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index edb1984..6e29f7a 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -704,6 +704,12 @@ static struct pci_bus *pci_alloc_child_bus(struct pci_bus *parent, int i; int ret; + if (busnr > parent->busn_res.end) { + dev_printk(KERN_DEBUG, &parent->dev, + "can not alloc bus:%d under %pR\n", busnr, + &parent->busn_res); + return NULL; + } /* * Allocate a new bus, and inherit stuff from the parent.. */ -- 2.6.2.307.g37023ba -- 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/