ASoC: sirf: Fix potential NULL pointer dereference

commit ae1c696a480c67c45fb23b35162183f72c6be0e1 upstream.

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: 2bd8d1d5cf89 ("ASoC: sirf: Add audio usp interface driver")
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/sound/soc/sirf/sirf-usp.c b/sound/soc/sirf/sirf-usp.c
index 45fc06c0e0e551f00ef6f89717a8dbab2dcdbd91..6b504f407079bb69fb8d7a2b37f1621fcf61a3cf 100644 (file)
--- a/sound/soc/sirf/sirf-usp.c
+++ b/sound/soc/sirf/sirf-usp.c
@@ -367,10 +367,9 @@ static int sirf_usp_pcm_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, usp);
 
        mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       base = devm_ioremap(&pdev->dev, mem_res->start,
-               resource_size(mem_res));
-       if (base == NULL)
-               return -ENOMEM;
+       base = devm_ioremap_resource(&pdev->dev, mem_res);
+       if (IS_ERR(base))
+               return PTR_ERR(base);
        usp->regmap = devm_regmap_init_mmio(&pdev->dev, base,
                                            &sirf_usp_regmap_config);
        if (IS_ERR(usp->regmap))