diff options
| author | Jaehoon Chung <jh80.chung@samsung.com> | 2018-01-22 05:28:54 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-22 15:28:42 +0300 |
| commit | dc3782a3e9c61872df8c8ed395b60d3b7ad782b8 (patch) | |
| tree | e234e5fc13d7b38887a714318538f72bf443615d | |
| parent | b1c3ce0cfff275ee2e88fe505a8f44712303f895 (diff) | |
| download | linux-dc3782a3e9c61872df8c8ed395b60d3b7ad782b8.tar.xz | |
PCI: exynos: Fix a potential init_clk_resources NULL pointer dereference
commit b5d6bc90c9129279d363ccbc02ad11e7b657c0b4 upstream.
In order to avoid triggering a NULL pointer dereference in
exynos_pcie_probe() a check must be put in place to detect if
the init_clk_resources hook is initialized before calling it.
Add the respective function pointer check in exynos_pcie_probe().
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
[lorenzo.pieralisi@arm.com: rewrote the commit log]
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/pci/dwc/pci-exynos.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/dwc/pci-exynos.c b/drivers/pci/dwc/pci-exynos.c index 5596fdedbb94..ea03f1ec12a4 100644 --- a/drivers/pci/dwc/pci-exynos.c +++ b/drivers/pci/dwc/pci-exynos.c @@ -695,7 +695,8 @@ static int __init exynos_pcie_probe(struct platform_device *pdev) return ret; } - if (ep->ops && ep->ops->get_clk_resources) { + if (ep->ops && ep->ops->get_clk_resources && + ep->ops->init_clk_resources) { ret = ep->ops->get_clk_resources(ep); if (ret) return ret; |