From: Bjorn Helgaas <bhelgaas@google.com>
To: Andreas Noever <andreas.noever@gmail.com>
Cc: linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org
Subject: Re: [PATCH] PCI: Prevent NULL dereference during pciehp probe
Date: Tue, 16 Sep 2014 15:20:48 -0600 [thread overview]
Message-ID: <20140916212048.GA5050@google.com> (raw)
In-Reply-To: <1402347812-8059-1-git-send-email-andreas.noever@gmail.com>
On Mon, Jun 09, 2014 at 11:03:32PM +0200, Andreas Noever wrote:
> pciehp assumes that dev->subordinate exists. But we do not assign a bus
> if we run out of bus numbers during enumeration. This leads to a NULL
> dereference in init_slot (and other places).
>
> Change pciehp_probe to return -ENODEV when no subordinate bus is
> present.
>
> Signed-off-by: Andreas Noever <andreas.noever@gmail.com>
Applied to pci/hotplug for v3.18, thanks!
> ---
> drivers/pci/hotplug/pciehp_core.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
> index 0e0a2ff..e5abcaf 100644
> --- a/drivers/pci/hotplug/pciehp_core.c
> +++ b/drivers/pci/hotplug/pciehp_core.c
> @@ -255,6 +255,13 @@ static int pciehp_probe(struct pcie_device *dev)
> else if (pciehp_acpi_slot_detection_check(dev->port))
> goto err_out_none;
>
> + if (!dev->port->subordinate) {
> + /* Can happen if we run out of bus numbers during probe */
> + dev_err(&dev->device,
> + "Hotplug bridge without secondary bus, ignoring\n");
> + goto err_out_none;
> + }
> +
> ctrl = pcie_init(dev);
> if (!ctrl) {
> dev_err(&dev->device, "Controller initialization failed\n");
> --
> 2.0.0
>
prev parent reply other threads:[~2014-09-16 21:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-09 21:03 [PATCH] PCI: Prevent NULL dereference during pciehp probe Andreas Noever
2014-09-15 22:20 ` Rajat Jain
2014-09-23 21:55 ` Guenter Roeck
2014-09-23 22:04 ` Bjorn Helgaas
2014-09-23 22:07 ` Guenter Roeck
2014-09-16 21:20 ` Bjorn Helgaas [this message]
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=20140916212048.GA5050@google.com \
--to=bhelgaas@google.com \
--cc=andreas.noever@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.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).