[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1400191076-28279-1-git-send-email-rickard_strandqvist@spectrumdigital.se>
Date: Thu, 15 May 2014 23:57:56 +0200
From: Rickard Strandqvist <rickard_strandqvist@...ctrumdigital.se>
To: Ben Dooks <ben-linux@...ff.org>, Kukjin Kim <kgene.kim@...sung.com>
Cc: Rickard Strandqvist <rickard_strandqvist@...ctrumdigital.se>,
Sangbeom Kim <sbkim73@...sung.com>,
Liam Girdwood <lgirdwood@...il.com>,
Mark Brown <broonie@...nel.org>,
Jaroslav Kysela <perex@...ex.cz>, Takashi Iwai <tiwai@...e.de>,
linux-arm-kernel@...ts.infradead.org,
linux-samsung-soc@...r.kernel.org, alsa-devel@...a-project.org,
linux-kernel@...r.kernel.org
Subject: [PATCH] Fix for possible null pointer dereference in dma.c
There is otherwise a risk of a possible null pointer dereference.
Was largely found by using a static code analysis program called cppcheck.
Signed-off-by: Rickard Strandqvist <rickard_strandqvist@...ctrumdigital.se>
---
sound/soc/samsung/dma.c | 10 ++++++----
1 fil ändrad, 6 tillägg(+), 4 borttagningar(-)
diff --git a/sound/soc/samsung/dma.c b/sound/soc/samsung/dma.c
index dc09b71..b1f6757 100644
--- a/sound/soc/samsung/dma.c
+++ b/sound/soc/samsung/dma.c
@@ -115,17 +115,19 @@ static void dma_enqueue(struct snd_pcm_substream *substream)
static void audio_buffdone(void *data)
{
struct snd_pcm_substream *substream = data;
- struct runtime_data *prtd = substream->runtime->private_data;
+ struct runtime_data *prtd = NULL;
pr_debug("Entered %s\n", __func__);
- if (prtd->state & ST_RUNNING) {
+ if(substream)
+ prtd = substream->runtime->private_data;
+
+ if (prtd && prtd->state & ST_RUNNING) {
prtd->dma_pos += prtd->dma_period;
if (prtd->dma_pos >= prtd->dma_end)
prtd->dma_pos = prtd->dma_start;
- if (substream)
- snd_pcm_period_elapsed(substream);
+ snd_pcm_period_elapsed(substream);
spin_lock(&prtd->lock);
if (!samsung_dma_has_circular()) {
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists