Skip to content

logger: bound uuid pointer to include the entry size #10921

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

logger: bound uuid pointer to include the entry size #10921

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
8 changes: 7 additions & 1 deletion tools/logger/convert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,14 @@ static const char *format_uid(uint32_t uid_ptr, int use_colors, bool be, bool up
const struct sof_uuid_entry *uid_entry;
char *str;

/*
* The whole struct sof_uuid_entry is read at uid_ptr, so require that
* many bytes to remain in the uids region; a bare ">=" upper bound
* would accept a pointer whose entry straddles the end of the buffer.
*/
if (uid_ptr < uids_dict->base_address ||
uid_ptr >= uids_dict->base_address + uids_dict->data_length) {
uid_ptr + sizeof(struct sof_uuid_entry) >
uids_dict->base_address + uids_dict->data_length) {
Comment on lines 134 to +136
str = calloc(1, strlen(BAD_PTR_STR) + 1 + 6);
if (!str) {
log_err("can't allocate memory\n");
Expand Down
Loading