mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-04 13:30:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

topology: decode: Change declaration of enum decoding function

Browse source 
Size constraints are always checked before invoking
tplg_decode_control_enum1. There is no need to validate it twice.
Alos moved debug print about size to invoking function, since now it's it
responsibility to check size.

Signed-off-by: Piotr Maziarz <piotrx.maziarz@linux.intel.com>
Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
Reviewed-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Piotr Maziarz 2020-08-31 11:08:59 +02:00 • committed by Jaroslav Kysela
parent 56a096ca2c
commit c32498603a
3 changed files with 7 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/topology/ctl.c
View file

@ -1335,22 +1335,10 @@ int tplg_decode_control_enum1(snd_tplg_t *tplg,
struct list_head *heap, struct list_head *heap,
struct snd_tplg_enum_template *et, struct snd_tplg_enum_template *et,
size_t pos, size_t pos,
void *bin, size_t size) struct snd_soc_tplg_enum_control *ec)
{ {
struct snd_soc_tplg_enum_control *ec = bin;
int i; int i;
if (size < sizeof(*ec)) {
SNDERR("enum: small size %d", size);
return -EINVAL;
}
tplg_log(tplg, 'D', pos, "enum: size %d private size %d",
ec->size, ec->priv.size);
if (size != ec->size + ec->priv.size) {
SNDERR("enum: unexpected element size %d", size);
return -EINVAL;
}
if (ec->num_channels > SND_TPLG_MAX_CHAN || if (ec->num_channels > SND_TPLG_MAX_CHAN ||
ec->num_channels > SND_SOC_TPLG_MAX_CHAN) { ec->num_channels > SND_SOC_TPLG_MAX_CHAN) {
SNDERR("enum: unexpected channel count %d", ec->num_channels); SNDERR("enum: unexpected channel count %d", ec->num_channels);
@ -1427,7 +1415,10 @@ next:
return -EINVAL; return -EINVAL;
} }
err = tplg_decode_control_enum1(tplg, &heap, &et, pos, bin, size); tplg_log(tplg, 'D', pos, "enum: size %d private size %d",
ec->size, ec->priv.size);
err = tplg_decode_control_enum1(tplg, &heap, &et, pos, ec);
if (err >= 0) { if (err >= 0) {
t.enum_ctl = &et; t.enum_ctl = &et;
err = snd_tplg_add_object(tplg, &t); err = snd_tplg_add_object(tplg, &t);

3
src/topology/dapm.c
View file

@ -972,8 +972,7 @@ next:
err = -EINVAL; err = -EINVAL;
goto retval; goto retval;
} }
err = tplg_decode_control_enum1(tplg, &heap, et, pos, err = tplg_decode_control_enum1(tplg, &heap, et, pos, ec);
bin, size2);
break; break;
case SND_SOC_TPLG_TYPE_BYTES: case SND_SOC_TPLG_TYPE_BYTES:
bt = tplg_calloc(&heap, sizeof(*bt)); bt = tplg_calloc(&heap, sizeof(*bt));

2
src/topology/tplg_local.h
View file

@ -398,7 +398,7 @@ int tplg_decode_control_enum1(snd_tplg_t *tplg,
struct list_head *heap, struct list_head *heap,
struct snd_tplg_enum_template *et, struct snd_tplg_enum_template *et,
size_t pos, size_t pos,
void *bin, size_t size); struct snd_soc_tplg_enum_control *ec);
int tplg_decode_control_enum(snd_tplg_t *tplg, size_t pos, int tplg_decode_control_enum(snd_tplg_t *tplg, size_t pos,
struct snd_soc_tplg_hdr *hdr, struct snd_soc_tplg_hdr *hdr,
void *bin, size_t size); void *bin, size_t size);