summaryrefslogtreecommitdiffstats
path: root/drivers/pci/probe.c
diff options
context:
space:
mode:
authorShyam Iyer <shyam.iyer.t@gmail.com>2011-09-08 23:41:17 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-09-10 04:49:58 +0200
commit5307f6d5fb12fd01f9f321bc4a8fd77e74858647 (patch)
treefa0087ac08c4a914e8c3456741d57ddf27534b9a /drivers/pci/probe.c
parentMerge branch 'for-linus' of git://dev.laptop.org/users/cjb/mmc (diff)
downloadlinux-5307f6d5fb12fd01f9f321bc4a8fd77e74858647.tar.xz
linux-5307f6d5fb12fd01f9f321bc4a8fd77e74858647.zip
Fix pointer dereference before call to pcie_bus_configure_settings
Commit b03e7495a862 ("PCI: Set PCI-E Max Payload Size on fabric") introduced a potential NULL pointer dereference in calls to pcie_bus_configure_settings due to attempts to access pci_bus self variables when the self pointer is NULL. To correct this, verify that the self pointer in pci_bus is non-NULL before dereferencing it. Reported-by: Stanislaw Gruszka <sgruszka@redhat.com> Signed-off-by: Shyam Iyer <shyam_iyer@dell.com> Signed-off-by: Jon Mason <mason@myri.com> Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/pci/probe.c')
-rw-r--r--drivers/pci/probe.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 8473727b29fa..0820fc1544e8 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1456,9 +1456,6 @@ void pcie_bus_configure_settings(struct pci_bus *bus, u8 mpss)
{
u8 smpss = mpss;
- if (!bus->self)
- return;
-
if (!pci_is_pcie(bus->self))
return;