Skip to content

ipc4: helper: bound TLV length safely when parsing DMA configs #11028

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

ipc4: helper: bound TLV length safely when parsing DMA configs #11028

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
15 changes: 12 additions & 3 deletions src/ipc/ipc4/helper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1482,10 +1482,19 @@ int ipc4_find_all_dma_configs_tlvs_only(struct ipc_config_dai *dai,
struct ipc_dma_config *dma_cfg;
int count = 0;

for (tlvs = (struct sof_tlv *)data_buffer; tlvs && (uintptr_t)tlvs < end_addr;
for (tlvs = (struct sof_tlv *)data_buffer;
tlvs && (uintptr_t)tlvs + sizeof(*tlvs) <= end_addr;
tlvs = tlv_next(tlvs)) {
if ((uintptr_t)tlvs->value + tlvs->length > end_addr) {
tr_err(&ipc_tr, "Unexpected TLV length %d: exceeds buffer size", tlvs->length);
/*
* tlvs->length is host-controlled: computing
* "tlvs->value + tlvs->length" can overflow the pointer and
* wrap below end_addr, bypassing this check and letting
* tlv_next() advance to a wild address. Compare against the
* remaining space instead. The loop condition guarantees the
* TLV header fits, so end_addr - tlvs->value does not underflow.
*/
if (tlvs->length > end_addr - (uintptr_t)tlvs->value) {
tr_err(&ipc_tr, "Unexpected TLV length %u: exceeds buffer size", tlvs->length);
return IPC4_INVALID_REQUEST;
}

Expand Down
Loading