* [PATCH] sound: soc: samsung: dma.c: Fix for possible null pointer dereference
@ 2014-05-19 21:37 ` Rickard Strandqvist
0 siblings, 0 replies; 5+ messages in thread
From: Rickard Strandqvist @ 2014-05-19 21:37 UTC (permalink / raw)
To: Ben Dooks, Kukjin Kim
Cc: Rickard Strandqvist, Sangbeom Kim, Liam Girdwood, Mark Brown,
Jaroslav Kysela, Takashi Iwai, linux-arm-kernel,
linux-samsung-soc, alsa-devel, linux-kernel
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@spectrumdigital.se>
---
sound/soc/samsung/dma.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/sound/soc/samsung/dma.c b/sound/soc/samsung/dma.c
index dc09b71..1d9bcaa 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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] sound: soc: samsung: dma.c: Fix for possible null pointer dereference
@ 2014-05-19 21:37 ` Rickard Strandqvist
0 siblings, 0 replies; 5+ messages in thread
From: Rickard Strandqvist @ 2014-05-19 21:37 UTC (permalink / raw)
To: linux-arm-kernel
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@spectrumdigital.se>
---
sound/soc/samsung/dma.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/sound/soc/samsung/dma.c b/sound/soc/samsung/dma.c
index dc09b71..1d9bcaa 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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] sound: soc: samsung: dma.c: Fix for possible null pointer dereference
2014-05-19 21:37 ` Rickard Strandqvist
(?)
@ 2014-05-20 5:40 ` Tushar Behera
-1 siblings, 0 replies; 5+ messages in thread
From: Tushar Behera @ 2014-05-20 5:40 UTC (permalink / raw)
To: Rickard Strandqvist, Ben Dooks, Kukjin Kim
Cc: Sangbeom Kim, Liam Girdwood, Mark Brown, Jaroslav Kysela,
Takashi Iwai, linux-arm-kernel, linux-samsung-soc, alsa-devel,
linux-kernel
On 05/20/2014 03:07 AM, Rickard Strandqvist wrote:
> 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@spectrumdigital.se>
> ---
> sound/soc/samsung/dma.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/sound/soc/samsung/dma.c b/sound/soc/samsung/dma.c
> index dc09b71..1d9bcaa 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;
I am not sure if this check is required as audio_buffdone() is set as a
callback function with known valid parameter during dma_enqueue().
>
> pr_debug("Entered %s\n", __func__);
>
> - if (prtd->state & ST_RUNNING) {
> + if (substream)
> + prtd = substream->runtime->private_data;
> +
> + if (prtd && prtd->state & ST_RUNNING) {
ditto as above
> 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);
This check certainly can be removed as snd_pcm_period_elapsed() also
checks the validity of the argument.
--
Tushar Behera
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] sound: soc: samsung: dma.c: Fix for possible null pointer dereference
@ 2014-05-20 5:40 ` Tushar Behera
0 siblings, 0 replies; 5+ messages in thread
From: Tushar Behera @ 2014-05-20 5:40 UTC (permalink / raw)
To: Rickard Strandqvist, Ben Dooks, Kukjin Kim
Cc: alsa-devel, linux-samsung-soc, Sangbeom Kim, linux-kernel,
Liam Girdwood, Jaroslav Kysela, Takashi Iwai, Mark Brown,
linux-arm-kernel
On 05/20/2014 03:07 AM, Rickard Strandqvist wrote:
> 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@spectrumdigital.se>
> ---
> sound/soc/samsung/dma.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/sound/soc/samsung/dma.c b/sound/soc/samsung/dma.c
> index dc09b71..1d9bcaa 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;
I am not sure if this check is required as audio_buffdone() is set as a
callback function with known valid parameter during dma_enqueue().
>
> pr_debug("Entered %s\n", __func__);
>
> - if (prtd->state & ST_RUNNING) {
> + if (substream)
> + prtd = substream->runtime->private_data;
> +
> + if (prtd && prtd->state & ST_RUNNING) {
ditto as above
> 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);
This check certainly can be removed as snd_pcm_period_elapsed() also
checks the validity of the argument.
--
Tushar Behera
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] sound: soc: samsung: dma.c: Fix for possible null pointer dereference
@ 2014-05-20 5:40 ` Tushar Behera
0 siblings, 0 replies; 5+ messages in thread
From: Tushar Behera @ 2014-05-20 5:40 UTC (permalink / raw)
To: linux-arm-kernel
On 05/20/2014 03:07 AM, Rickard Strandqvist wrote:
> 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@spectrumdigital.se>
> ---
> sound/soc/samsung/dma.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/sound/soc/samsung/dma.c b/sound/soc/samsung/dma.c
> index dc09b71..1d9bcaa 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;
I am not sure if this check is required as audio_buffdone() is set as a
callback function with known valid parameter during dma_enqueue().
>
> pr_debug("Entered %s\n", __func__);
>
> - if (prtd->state & ST_RUNNING) {
> + if (substream)
> + prtd = substream->runtime->private_data;
> +
> + if (prtd && prtd->state & ST_RUNNING) {
ditto as above
> 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);
This check certainly can be removed as snd_pcm_period_elapsed() also
checks the validity of the argument.
--
Tushar Behera
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-05-20 5:41 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-05-19 21:37 [PATCH] sound: soc: samsung: dma.c: Fix for possible null pointer dereference Rickard Strandqvist
2014-05-19 21:37 ` Rickard Strandqvist
2014-05-20 5:40 ` Tushar Behera
2014-05-20 5:40 ` Tushar Behera
2014-05-20 5:40 ` Tushar Behera
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.