[PATCH] Fix NULL ptr dereference in pci_bus_assign_domain_nr() on ARM

From	khalasa@piap.pl (Krzysztof Hałasa)
Newsgroups	linux.kernel
Subject	[PATCH] Fix NULL ptr dereference in pci_bus_assign_domain_nr() on ARM
Date	2016-03-01 07:10 +0100
Message-ID	<r7LFn-5iU-5@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Many ARM platforms use a wrapper:
/*
 * Compatibility wrapper for older platforms that do not care about
 * passing the parent device.
 */
static inline void pci_common_init(struct hw_pci *hw)
{
        pci_common_init_dev(NULL, hw);
}

which means that pci_bus_assign_domain_nr() can be called without
a parent. This patch fixes the NULL pointer dereference.

Signed-off-by: Krzysztof Hałasa <khalasa@piap.pl>
Cc: stable@vger.kernel.org

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 602eb42..f89db3a 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -4772,8 +4772,10 @@ int pci_get_new_domain_nr(void)
 void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent)
 {
 	static int use_dt_domains = -1;
-	int domain = of_get_pci_domain_nr(parent->of_node);
+	int domain = -1;
 
+	if (parent)
+		domain = of_get_pci_domain_nr(parent->of_node);
 	/*
 	 * Check DT domain and use_dt_domains values.
 	 *

-- 
Krzysztof Halasa

Industrial Research Institute for Automation and Measurements PIAP
Al. Jerozolimskie 202, 02-486 Warsaw, Poland

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] Fix NULL ptr dereference in pci_bus_assign_domain_nr() on ARM khalasa@piap.pl (Krzysztof Hałasa) - 2016-03-01 07:10 +0100
  Re: [PATCH] Fix NULL ptr dereference in pci_bus_assign_domain_nr()  on ARM Bjorn Helgaas <helgaas@kernel.org> - 2016-03-03 18:40 +0100
    Re: [PATCH] Fix NULL ptr dereference in pci_bus_assign_domain_nr() on ARM khalasa@piap.pl (Krzysztof Hałasa) - 2016-03-04 07:20 +0100

csiph-web