Skip to content

logger: validate uids dictionary offset and uid entry bounds #11313

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
Shrusti-pk wants to merge 1 commit into
base: main
Choose a base branch
from
Open

logger: validate uids dictionary offset and uid entry bounds #11313

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 tools/logger/convert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,8 +420,9 @@ static const char *get_component_name(uint32_t trace_class, uint32_t uid_ptr)
/* if uid_ptr is non-zero, find name in the ldc file */
if (uid_ptr) {
if (uid_ptr < uids_dict->base_address ||
uid_ptr >= uids_dict->base_address +
uids_dict->data_length)
uids_dict->data_length < sizeof(struct sof_uuid_entry) ||
uid_ptr - uids_dict->base_address >
uids_dict->data_length - sizeof(struct sof_uuid_entry))
return "<uid?>";
uid_entry = get_uuid_entry(uid_ptr);
return uid_entry->name;
Expand Down Expand Up @@ -1127,6 +1128,16 @@ int convert(void)
log_err("invalid uuid section signature.\n");
return -EINVAL;
}
/*
* The uuid entries are always read right after the header below, so
* any other data_offset would make every dictionary lookup through
* uids_dict->data_offset point outside of the allocation.
*/
if (uids_hdr.data_offset != sizeof(uids_hdr)) {
log_err("invalid uuid section data offset %u.\n",
uids_hdr.data_offset);
return -EINVAL;
}
config->uids_dict = calloc(1, sizeof(uids_hdr) + uids_hdr.data_length);
if (!config->uids_dict) {
log_err("failed to alloc memory for uuids.\n");
Expand Down
Loading