[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1511238476-10314-1-git-send-email-linux@roeck-us.net>
Date: Mon, 20 Nov 2017 20:27:56 -0800
From: Guenter Roeck <linux@...ck-us.net>
To: Liam Girdwood <lgirdwood@...il.com>
Cc: Mark Brown <broonie@...nel.org>, Jaroslav Kysela <perex@...ex.cz>,
Takashi Iwai <tiwai@...e.com>, alsa-devel@...a-project.org,
linux-kernel@...r.kernel.org, Guenter Roeck <linux@...ck-us.net>,
Alex Deucher <alexander.deucher@....com>,
Dominik Behr <dbehr@...omium.org>,
Daniel Kurtz <djkurtz@...omium.org>
Subject: [PATCH] ASoC: amd: Add error checking to probe function
The acp_audio_dma does not perform sufficient error checking in its probe
function. This can result in crashes if a critical error path is
encountered.
Fixes: 7c31335a03b6a ("ASoC: AMD: add AMD ASoC ACP 2.x DMA driver")
Cc: Alex Deucher <alexander.deucher@....com>
Cc: Dominik Behr <dbehr@...omium.org>
Cc: Daniel Kurtz <djkurtz@...omium.org>
Signed-off-by: Guenter Roeck <linux@...ck-us.net>
---
I didn't add an error check to acp_init() since I was not sure if
its return value is ignored on purpose.
sound/soc/amd/acp-pcm-dma.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/sound/soc/amd/acp-pcm-dma.c b/sound/soc/amd/acp-pcm-dma.c
index 9f521a55d610..b5e41df6bb3a 100644
--- a/sound/soc/amd/acp-pcm-dma.c
+++ b/sound/soc/amd/acp-pcm-dma.c
@@ -1051,6 +1051,11 @@ static int acp_audio_probe(struct platform_device *pdev)
struct resource *res;
const u32 *pdata = pdev->dev.platform_data;
+ if (!pdata) {
+ dev_err(&pdev->dev, "Missing platform data\n");
+ return -ENODEV;
+ }
+
audio_drv_data = devm_kzalloc(&pdev->dev, sizeof(struct audio_drv_data),
GFP_KERNEL);
if (audio_drv_data == NULL)
@@ -1058,6 +1063,8 @@ static int acp_audio_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
audio_drv_data->acp_mmio = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(audio_drv_data->acp_mmio))
+ return PTR_ERR(audio_drv_data->acp_mmio);
/* The following members gets populated in device 'open'
* function. Till then interrupts are disabled in 'acp_init'
--
2.7.4
Powered by blists - more mailing lists