Skip to content

ASoC: SOF: ipc3-control: Reject ABI data size larger than the TLV pay… #5871

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
ujfalusi wants to merge 1 commit into
base: topic/sof-dev
Choose a base branch
from
Open

ASoC: SOF: ipc3-control: Reject ABI data size larger than the TLV pay… #5871

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
10 changes: 10 additions & 0 deletions sound/soc/sof/ipc3-control.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,7 @@ static int sof_ipc3_bytes_ext_put(struct snd_sof_control *scontrol,
struct sof_ipc_ctrl_data *cdata = scontrol->ipc_control_data;
struct snd_soc_component *scomp = scontrol->scomp;
struct snd_ctl_tlv header;
unsigned int payload;
int ret = -EINVAL;

/*
Expand Down Expand Up @@ -449,6 +450,15 @@ static int sof_ipc3_bytes_ext_put(struct snd_sof_control *scontrol,
goto err_restore;
}

/* header.length has been verified to be >= sizeof(struct sof_abi_hdr) */
payload = header.length - sizeof(struct sof_abi_hdr);
if (cdata->data->size > payload) {
dev_err_ratelimited(scomp->dev,
"ABI header claims %u bytes of data, TLV carries %u\n",
cdata->data->size, payload);
goto err_restore;
}

/* notify DSP of byte control updates */
if (pm_runtime_active(scomp->dev)) {
/* Actually send the data to the DSP; this is an opportunity to validate the data */
Expand Down
Loading