OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ipc3: Check ipc size check for pcm_params to account for ext_data 

Now that sof_ipc_pcm_params struct has some extended data at the end
the hdr.size will also account for this data.

Change sanity condition to see if hdr.size is updated to keep track of
extended data.

Also check that ext_data will not go beyond SOF_IPC_MAX_SIZE.

Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
This commit is contained in:
Daniel Baluta 2022-03-23 17:39:07 +02:00 committed by Liam Girdwood
parent 0fa42076a0
commit 68e8c9066f
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/ipc/ipc3/handler.c
View File

@ -219,8 +219,26 @@ static int ipc_stream_pcm_params(uint32_t stream)
return -EINVAL; return -EINVAL;
} }
if (IPC_IS_SIZE_INVALID(pcm_params.params)) { /* sanity check for pcm_params size */
IPC_SIZE_ERROR_TRACE(&ipc_tr, pcm_params.params); if (pcm_params.hdr.size !=
sizeof(pcm_params) + pcm_params.params.ext_data_length) {
tr_err(&ipc_tr, "pcm_params invalid size, hdr.size=%d, ext_data_len=%d",
pcm_params.hdr.size, pcm_params.params.ext_data_length);
return -EINVAL;
}
/* sanity check for pcm_params.params size */
if (pcm_params.params.hdr.size !=
sizeof(pcm_params.params) + pcm_params.params.ext_data_length) {
tr_err(&ipc_tr, "pcm_params.params invalid size, hdr.size=%d, ext_data_len=%d",
pcm_params.params.hdr.size, pcm_params.params.ext_data_length);
return -EINVAL;
}
if (sizeof(pcm_params) + pcm_params.params.ext_data_length > SOF_IPC_MSG_MAX_SIZE) {
tr_err(&ipc_tr, "pcm_params ext_data_length invalid size %d max allowed %d",
pcm_params.params.ext_data_length,
SOF_IPC_MSG_MAX_SIZE - sizeof(pcm_params));
return -EINVAL; return -EINVAL;
} }