ASoC: amd: Fix potential NULL pointer dereference
Subsystems (3)
PATCH 1/1 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.
--- sound/soc/amd/raven/acp3x-pcm-dma.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
sound/soc/amd/raven/acp3x-pcm-dma.c +4 -2
@@ -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));
Signature · 1 line
2.20.1
Mark Brown
maintainerApplied "ASoC: amd: Fix potential NULL pointer dereference" to the asoc tree
The patch
ASoC: amd: Fix potential NULL pointer dereference
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
4cb79ef9c6c4413427cd70afbb1f3bc01e9b7abfMon Sep 17 00:00:00 2001
From: "Gustavo A. R. Silva" <[email protected]>
Date: Mon, 14 Jan 2019 17:40:10 -0600
Subject: [PATCH] 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.
--- sound/soc/amd/raven/acp3x-pcm-dma.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
sound/soc/amd/raven/acp3x-pcm-dma.c +4 -2
@@ -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));
Signature · 1 line
2.20.1