diff options
| author | Vinod Koul <vinod.koul@linux.intel.com> | 2012-09-17 11:51:26 +0530 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-09-17 09:54:50 +0200 |
| commit | fb4a9779f1267539292268d7363e17180eb4ee5c (patch) | |
| tree | 960691ff81a94693b2d0e4ff5db1ba8055bd6f0a | |
| parent | 4dc040a0b34890d2adc0d63da6e9bfb4eb791b19 (diff) | |
| download | linux-fb4a9779f1267539292268d7363e17180eb4ee5c.tar.bz2 | |
ALSA: Compress - add codec parameter checks
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | include/sound/compress_params.h | 1 | ||||
| -rw-r--r-- | sound/core/compress_offload.c | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/sound/compress_params.h b/include/sound/compress_params.h index da4a456de032..602dc6c45d1a 100644 --- a/include/sound/compress_params.h +++ b/include/sound/compress_params.h @@ -72,6 +72,7 @@ #define SND_AUDIOCODEC_IEC61937 ((__u32) 0x0000000B) #define SND_AUDIOCODEC_G723_1 ((__u32) 0x0000000C) #define SND_AUDIOCODEC_G729 ((__u32) 0x0000000D) +#define SND_AUDIOCODEC_MAX SND_AUDIOCODEC_G729 /* * Profile and modes are listed with bit masks. This allows for a diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index bd7f28e89254..c40ae573346d 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -432,6 +432,16 @@ static int snd_compress_check_input(struct snd_compr_params *params) params->buffer.fragments > SIZE_MAX / params->buffer.fragment_size) return -EINVAL; + /* now codec parameters */ + if (params->codec.id == 0 || params->codec.id > SND_AUDIOCODEC_MAX) + return -EINVAL; + + if (params->codec.ch_in == 0 || params->codec.ch_out == 0) + return -EINVAL; + + if (!(params->codec.sample_rate & SNDRV_PCM_RATE_8000_192000)) + return -EINVAL; + return 0; } |