[PATCH] PCI: layerscape: Fix kernel panic on accessing NULL pointer

Li Yang leoyang.li at nxp.com
Mon Oct 17 14:44:06 PDT 2016


Commit fefe6733e added reference to the pcie->drvdata before it is
initialized which causes a kernel panic.  Fix the problem by
initializing the pcie->drvdata earlier before it is used.

Reported-by: Stuart Yoder <stuart.yoder at nxp.com>
Signed-off-by: Li Yang <leoyang.li at nxp.com>
---
 drivers/pci/host/pci-layerscape.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pci/host/pci-layerscape.c b/drivers/pci/host/pci-layerscape.c
index 2cb7315..958187f 100644
--- a/drivers/pci/host/pci-layerscape.c
+++ b/drivers/pci/host/pci-layerscape.c
@@ -245,6 +245,7 @@ static int __init ls_pcie_probe(struct platform_device *pdev)
 	if (!pcie)
 		return -ENOMEM;
 
+	pcie->drvdata = match->data;
 	pp = &pcie->pp;
 	pp->dev = dev;
 	pp->ops = pcie->drvdata->ops;
@@ -256,7 +257,6 @@ static int __init ls_pcie_probe(struct platform_device *pdev)
 		return PTR_ERR(pcie->pp.dbi_base);
 	}
 
-	pcie->drvdata = match->data;
 	pcie->lut = pcie->pp.dbi_base + pcie->drvdata->lut_offset;
 
 	if (!ls_pcie_is_bridge(pcie))
-- 
1.9.0




More information about the linux-arm-kernel mailing list