Skip to content

audio: drc: register IPC-time blob validator #10943

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

Open
singalsu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

audio: drc: register IPC-time blob validator #10943

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
31 changes: 28 additions & 3 deletions src/audio/drc/drc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,20 @@ static int drc_setup(struct processing_module *mod, uint16_t channels, uint32_t
return drc_set_pre_delay_time(&cd->state, cd->config->params.pre_delay_time, rate);
}

static int drc_validator(struct comp_dev *dev, void *new_data, uint32_t new_data_size)
{
struct sof_drc_config *config = new_data;

if (new_data_size != sizeof(struct sof_drc_config) ||
new_data_size != config->size) {
comp_err(dev, "invalid configuration blob, size %u, expected %zu",
new_data_size, sizeof(struct sof_drc_config));
return -EINVAL;
}

return 0;
}

/*
* End of DRC setup code. Next the standard component methods.
*/
Expand Down Expand Up @@ -353,10 +367,14 @@ static int drc_prepare(struct processing_module *mod,
/* Initialize DRC */
comp_info(dev, "source_format=%d", cd->source_format);
cd->config = comp_get_data_blob(cd->model_handler, &data_size, NULL);
/* the blob is dereferenced as a struct sof_drc_config below and in
* drc_setup(), so require it to be at least that large
/* The blob is dereferenced as a struct sof_drc_config below and in
* drc_setup(), so size-check it before use. Discard a malformed blob
* so the runtime path (drc_process()) cannot dereference it.
*/
if (cd->config && data_size >= sizeof(struct sof_drc_config)) {
if (cd->config && drc_validator(dev, cd->config, data_size) != 0)
cd->config = NULL;

if (cd->config) {
ret = drc_setup(mod, channels, rate);
if (ret < 0) {
comp_err(dev, "error: drc_setup failed.");
Expand All @@ -382,6 +400,11 @@ static int drc_prepare(struct processing_module *mod,
cd->drc_func = drc_default_pass;
}

/* Reject malformed blobs at IPC time so a bad run-time update cannot
* replace the working configuration.
*/
comp_data_blob_set_validator(cd->model_handler, drc_validator);

Comment on lines +403 to +407
comp_info(dev, "DRC is configured.");
return 0;
}
Expand All @@ -390,6 +413,8 @@ static int drc_reset(struct processing_module *mod)
{
struct drc_comp_data *cd = module_get_private_data(mod);

comp_data_blob_set_validator(cd->model_handler, NULL);

Comment on lines +416 to +417
drc_reset_state(mod, &cd->state);

return 0;
Expand Down
Loading