Skip to content

ipc4: handler-user: fix TLV walker pointer wraparound #10746

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
+13 −2
Open

ipc4: handler-user: fix TLV walker pointer wraparound #10746

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: 13 additions & 2 deletions src/ipc/ipc4/handler-user.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1085,7 +1085,7 @@ __cold static int ipc4_set_vendor_config_module_instance(struct comp_dev *dev,
* (4 bytes type | 4 bytes length=0 | no value)
* we do not handle such case
*/
if (data_off_size < sizeof(struct sof_tlv))
if (data_off_size < sizeof(struct sof_tlv) || data_off_size > MAILBOX_HOSTBOX_SIZE)
return IPC4_INVALID_CONFIG_DATA_STRUCT;

/* ===Iterate over payload===
Expand All @@ -1097,18 +1097,29 @@ __cold static int ipc4_set_vendor_config_module_instance(struct comp_dev *dev,
const uint8_t *end_offset = (const uint8_t *)data + data_off_size;

while ((const uint8_t *)tlv < end_offset) {
size_t remaining = (size_t)(end_offset - (const uint8_t *)tlv);

/* check for invalid length */
if (!tlv->length)
return IPC4_INVALID_CONFIG_DATA_LEN;

/* Validate TLV header + value fits within remaining
* payload to prevent OOB access and pointer wraparound
* on 32-bit arithmetic (CWE-190). Split into two checks
* to avoid overflow in the size_t addition itself.
*/
if (remaining < sizeof(struct sof_tlv) ||
tlv->length > remaining - sizeof(struct sof_tlv))
return IPC4_INVALID_REQUEST;

ret = drv->ops.set_large_config(dev, tlv->type, init_block,
final_block, tlv->length, tlv->value);
if (ret < 0) {
ipc_cmd_err(&ipc_tr, "failed to set large_config_module_instance %x : %x",
(uint32_t)module_id, (uint32_t)instance_id);
return IPC4_INVALID_RESOURCE_ID;
}
/* Move pointer to the end of this tlv */
/* Move pointer to the end of this tlv (aligned) */
tlv = (struct sof_tlv *)((const uint8_t *)tlv +
sizeof(struct sof_tlv) + ALIGN_UP(tlv->length, 4));
}
Expand Down
Loading