Skip to content

waves: verify payload size and initialize memory to zero to the allocated memory in waves.c #9009

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgirdwood merged 1 commit into from
Apr 12, 2024
Merged

waves: verify payload size and initialize memory to zero to the allocated memory in waves.c #9009

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/audio/module_adapter/module/waves/waves.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,6 +601,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 @@ -610,6 +611,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 @@ -653,6 +666,7 @@ static int waves_codec_init(struct processing_module *mod)
sizeof(struct waves_codec_data));
ret = -ENOMEM;
} else {
memset(waves_codec, 0, sizeof(struct waves_codec_data));
codec->private = waves_codec;
ret = waves_effect_allocate(mod);
if (ret) {
Expand Down