public inbox for kernel-janitors@vger.kernel.org
 help / color / mirror / Atom feed
* ALSA: core: check for underflow in snd_pcm_sw_params()
@ 2015-09-23  9:42 Dan Carpenter
  2015-09-24  9:46 ` Takashi Iwai
  0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2015-09-23  9:42 UTC (permalink / raw)
  To: Jaroslav Kysela
  Cc: Takashi Iwai, Pierre-Louis Bossart, alsa-devel, kernel-janitors

As far as I can see, having an invalid ->tstamp_mode is harmless, but
adding a check silences a static checker warning.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 75888dd..4863af5 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -650,7 +650,8 @@ static int snd_pcm_sw_params(struct snd_pcm_substream *substream,
 	}
 	snd_pcm_stream_unlock_irq(substream);
 
-	if (params->tstamp_mode > SNDRV_PCM_TSTAMP_LAST)
+	if (params->tstamp_mode < 0 ||
+	    params->tstamp_mode > SNDRV_PCM_TSTAMP_LAST)
 		return -EINVAL;
 	if (params->proto >= SNDRV_PROTOCOL_VERSION(2, 0, 12) &&
 	    params->tstamp_type > SNDRV_PCM_TSTAMP_TYPE_LAST)

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: ALSA: core: check for underflow in snd_pcm_sw_params()
  2015-09-23  9:42 ALSA: core: check for underflow in snd_pcm_sw_params() Dan Carpenter
@ 2015-09-24  9:46 ` Takashi Iwai
  0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2015-09-24  9:46 UTC (permalink / raw)
  To: Dan Carpenter
  Cc: Jaroslav Kysela, alsa-devel, Pierre-Louis Bossart,
	kernel-janitors

On Wed, 23 Sep 2015 11:42:28 +0200,
Dan Carpenter wrote:
> 
> As far as I can see, having an invalid ->tstamp_mode is harmless, but
> adding a check silences a static checker warning.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Applied, thanks.


Takashi

> 
> diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
> index 75888dd..4863af5 100644
> --- a/sound/core/pcm_native.c
> +++ b/sound/core/pcm_native.c
> @@ -650,7 +650,8 @@ static int snd_pcm_sw_params(struct snd_pcm_substream *substream,
>  	}
>  	snd_pcm_stream_unlock_irq(substream);
>  
> -	if (params->tstamp_mode > SNDRV_PCM_TSTAMP_LAST)
> +	if (params->tstamp_mode < 0 ||
> +	    params->tstamp_mode > SNDRV_PCM_TSTAMP_LAST)
>  		return -EINVAL;
>  	if (params->proto >= SNDRV_PROTOCOL_VERSION(2, 0, 12) &&
>  	    params->tstamp_type > SNDRV_PCM_TSTAMP_TYPE_LAST)
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-09-24  9:46 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-23  9:42 ALSA: core: check for underflow in snd_pcm_sw_params() Dan Carpenter
2015-09-24  9:46 ` Takashi Iwai

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox