linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Keith Busch <keith.busch@intel.com>
To: LKML <linux-kernel@vger.kernel.org>,
	x86@kernel.org, linux-pci@vger.kernel.org
Cc: Jiang Liu <jiang.liu@linux.intel.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	Dan Williams <dan.j.williams@intel.com>,
	Bjorn Helgaas <bhelgaas@google.com>,
	Bryan Veal <bryan.e.veal@intel.com>,
	Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
	Martin Mares <mj@ucw.cz>,
	Jon Derrick <jonathan.derrick@intel.com>,
	Keith Busch <keith.busch@intel.com>
Subject: [PATCHv6 2/7] pci: child bus alloc fix on constrained resource
Date: Mon,  7 Dec 2015 14:32:24 -0700	[thread overview]
Message-ID: <1449523949-21898-3-git-send-email-keith.busch@intel.com> (raw)
In-Reply-To: <1449523949-21898-1-git-send-email-keith.busch@intel.com>

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 <keith.busch@intel.com>
---
 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


  parent reply	other threads:[~2015-12-07 21:32 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-07 21:32 [PATCHv6 0/7] Driver for new "VMD" device Keith Busch
2015-12-07 21:32 ` [PATCHv6 1/7] msi: Relax msi_domain_alloc() to support parentless MSI irqdomains Keith Busch
2015-12-07 21:32 ` Keith Busch [this message]
2015-12-17 17:27   ` [PATCHv6 2/7] pci: child bus alloc fix on constrained resource Bjorn Helgaas
2015-12-17 17:57     ` Keith Busch
2015-12-17 17:41   ` Bjorn Helgaas
2015-12-07 21:32 ` [PATCHv6 3/7] Export msi and irq functions for module use Keith Busch
2015-12-07 21:32 ` [PATCHv6 4/7] x86-pci: allow pci domain specific dma ops Keith Busch
2015-12-07 21:32 ` [PATCHv6 5/7] x86/pci: Initial commit for new VMD device driver Keith Busch
2015-12-17 18:14   ` Bjorn Helgaas
2015-12-17 18:25     ` Keith Busch
2015-12-07 21:32 ` [PATCHv6 6/7] aer_inject: Use 32 bit int type domains Keith Busch
2015-12-17 17:46   ` Bjorn Helgaas
2015-12-17 18:16     ` Keith Busch
2015-12-07 21:32 ` [PATCHv5 7/7] pciutils: Allow 32-bit domains Keith Busch
2015-12-12 23:00   ` Andy Shevchenko
2015-12-17 17:15   ` Bjorn Helgaas
2015-12-17 17:34     ` Keith Busch
2015-12-17 18:26       ` Bjorn Helgaas
2016-01-03 14:11   ` Martin Mares
2016-01-04 22:29     ` Keith Busch
2016-01-11 19:19       ` Martin Mares
2015-12-08 12:15 ` [PATCHv6 0/7] Driver for new "VMD" device Thomas Gleixner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1449523949-21898-3-git-send-email-keith.busch@intel.com \
    --to=keith.busch@intel.com \
    --cc=bhelgaas@google.com \
    --cc=bryan.e.veal@intel.com \
    --cc=dan.j.williams@intel.com \
    --cc=hpa@zytor.com \
    --cc=jiang.liu@linux.intel.com \
    --cc=jonathan.derrick@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=mj@ucw.cz \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).