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

Unverified Commit ae1c696a authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Mark Brown
Browse files

ASoC: sirf: Fix potential NULL pointer dereference 



There is a potential execution path in which function
platform_get_resource() returns NULL. If this happens,
we will end up having a NULL pointer dereference.

Fix this by replacing devm_ioremap with devm_ioremap_resource,
which has the NULL check and the memory region request.

This code was detected with the help of Coccinelle.

Cc: stable@vger.kernel.org
Fixes: 2bd8d1d5 ("ASoC: sirf: Add audio usp interface driver")
Signed-off-by: default avatarGustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 43217236

sound/soc/sirf/sirf-usp.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -370,10 +370,9 @@ static int sirf_usp_pcm_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, usp);

	platform_set_drvdata(pdev, usp);





	mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	base = devm_ioremap(&pdev->dev, mem_res->start,

	base = devm_ioremap_resource(&pdev->dev, mem_res);

		resource_size(mem_res));

	if (IS_ERR(base))

	if (base == NULL)

		return PTR_ERR(base);

		return -ENOMEM;

	usp->regmap = devm_regmap_init_mmio(&pdev->dev, base,

	usp->regmap = devm_regmap_init_mmio(&pdev->dev, base,

					    &sirf_usp_regmap_config);

					    &sirf_usp_regmap_config);

	if (IS_ERR(usp->regmap))

	if (IS_ERR(usp->regmap))