Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9929a59 authored by Chuhong Yuan's avatar Chuhong Yuan Committed by Greg Kroah-Hartman
Browse files

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: default avatarChuhong Yuan <hslester96@gmail.com>
Link: https://lore.kernel.org/r/20191109080943.30428-1-hslester96@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 93056ca4

drivers/spi/spi-pxa2xx.c

+6 −0
Original line number Diff line number Diff line
@@ -1470,7 +1470,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);