Skip to content

ipc4: helper: validate host device_count before indexing channel map #10864

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
abonislawski wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −1
Open

ipc4: helper: validate host device_count before indexing channel map #10864

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: 9 additions & 1 deletion src/ipc/ipc4/helper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1313,12 +1313,20 @@ int ipc4_find_dma_config_multiple(struct ipc_config_dai *dai, uint8_t *data_buff
if (!dma_cfg)
continue;

uint32_t device_count = dma_cfg->channel_map.device_count;

if (device_count > GTW_DMA_DEVICE_MAX_COUNT) {
tr_err(&ipc_tr, "device_count %u exceeds max %u",
device_count, GTW_DMA_DEVICE_MAX_COUNT);
return IPC4_INVALID_REQUEST;
}

/* To be able to retrieve proper DMA config we need to check if
* device_id value (which is alh_id) is equal to device_address.
* They both contain SNDW master id and PDI. If they match then
* proper config is found.
*/
for (uint32_t i = 0; i < dma_cfg->channel_map.device_count; i++) {
for (uint32_t i = 0; i < device_count; i++) {
if (dma_cfg->channel_map.map[i].device_address == device_id) {
dai->host_dma_config[dma_cfg_idx] = dma_cfg;
return IPC4_SUCCESS;
Expand Down
Loading