Skip to content

Commit

Permalink
waves: verify payload size and initialize memory to zero to the
Browse files Browse the repository at this point in the history
       allocated memory in waves.c

    Enhance payload corruption handling by verifying size
    and make sure to have clean buffer before using it.

Signed-off-by: barry.jan <barry.jan@waves.com>
(cherry picked from commit 355e46f)
  • Loading branch information
barry-waves committed Apr 13, 2024
1 parent 475be1e commit 28e02fc
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions src/audio/module_adapter/module/waves.c
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,7 @@ static int waves_effect_apply_config(struct processing_module *mod)
/* incoming data in cfg->data is arranged according to struct module_param
* there migh be more than one struct module_param inside cfg->data, glued back to back
*/
const uint32_t header_size = sizeof(param->size) + sizeof(param->id);
for (index = 0; index < cfg->size && (!ret); param_number++) {
uint32_t param_data_size;

Expand All @@ -617,6 +618,18 @@ static int waves_effect_apply_config(struct processing_module *mod)
comp_info(dev, "waves_effect_apply_config() param num %d id %d size %d",
param_number, param->id, param->size);

if ((param->size <= header_size) || (param->size > MAX_CONFIG_SIZE_BYTES)) {
comp_err(dev, "waves_effect_apply_config() invalid module_param size: %d",
param->size);
return -EINVAL;
}

if ((index + param->size) > cfg->size) {
comp_err(dev, "waves_effect_apply_config() module_param size: %d exceeds cfg buffer size: %d",
param->size, cfg->size);
return -EINVAL;
}

switch (param->id) {
case PARAM_NOP:
comp_info(dev, "waves_effect_apply_config() NOP");
Expand Down Expand Up @@ -661,6 +674,7 @@ static int waves_codec_init(struct processing_module *mod)
ret = -ENOMEM;
goto err3;
} else {
memset(waves_codec, 0, sizeof(struct waves_codec_data));
codec->private = waves_codec;
ret = waves_effect_allocate(mod);
if (ret) {
Expand Down

0 comments on commit 28e02fc

Please sign in to comment.