Unverified Commit 4cb79ef9 authored Jan 14, 2019 by Gustavo A. R. Silva Committed by Mark Brown Jan 15, 2019

ASoC: amd: Fix potential NULL pointer dereference



Check return value from call to devm_kzalloc() in order to prevent a
potential NULL pointer dereference.

Also, notice that it makes no sense to allocate any resources if
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); fails,
so move the call to devm_kzalloc() below the mentioned code.

Lastly, improve the use of sizeof in the call to devm_kzalloc() by
changing it from sizeof(struct i2s_dev_data) to sizeof(*adata)

This issue was detected with the help of Coccinelle.

Fixes: ac289c7e ("ASoC: amd: add ACP3x PCM platform driver")
Cc: stable@vger.kernel.org
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent c407cd00

sound/soc/amd/raven/acp3x-pcm-dma.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -611,14 +611,16 @@ static int acp3x_audio_probe(struct platform_device *pdev)
		}
		irqflags = ((unsigned int )(pdev->dev.platform_data));

		adata = devm_kzalloc(&pdev->dev, sizeof(struct i2s_dev_data),
		GFP_KERNEL);
		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		if (!res) {
		dev_err(&pdev->dev, "IORESOURCE_IRQ FAILED\n");
		return -ENODEV;
		}

		adata = devm_kzalloc(&pdev->dev, sizeof(*adata), GFP_KERNEL);
		if (!adata)
		return -ENOMEM;

		adata->acp3x_base = devm_ioremap(&pdev->dev, res->start,
		resource_size(res));

Admin message