diff options
| author | Chuhong Yuan <hslester96@gmail.com> | 2019-11-09 16:09:43 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-31 12:37:37 +0100 |
| commit | dad729c48e9d61d03a512a36ba9947f8541e2009 (patch) | |
| tree | 4e31db7fe2e5f3dab8013818d36c9affe2bfc9c9 | |
| parent | b5c1ddeae6945b19cd7728f4dfcefa7fae3e4a40 (diff) | |
| download | linux-stable-dad729c48e9d61d03a512a36ba9947f8541e2009.tar.gz linux-stable-dad729c48e9d61d03a512a36ba9947f8541e2009.tar.bz2 linux-stable-dad729c48e9d61d03a512a36ba9947f8541e2009.zip | |
spi: pxa2xx: Add missed security checks
[ Upstream commit 5eb263ef08b5014cfc2539a838f39d2fd3531423 ]
pxa2xx_spi_init_pdata misses checks for devm_clk_get and
platform_get_irq.
Add checks for them to fix the bugs.
Since ssp->clk and ssp->irq are used in probe, they are mandatory here.
So we cannot use _optional() for devm_clk_get and platform_get_irq.
Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
Link: https://lore.kernel.org/r/20191109080943.30428-1-hslester96@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/spi/spi-pxa2xx.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index 9bf3e5f945c7..b2245cdce230 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -1559,7 +1559,13 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev) } ssp->clk = devm_clk_get(&pdev->dev, NULL); + if (IS_ERR(ssp->clk)) + return NULL; + ssp->irq = platform_get_irq(pdev, 0); + if (ssp->irq < 0) + return NULL; + ssp->type = type; ssp->pdev = pdev; ssp->port_id = pxa2xx_spi_get_port_id(adev); |