espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-19 17:18:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

display_loc_list

Browse Source 
* dwarf.c (display_loc_list): Avoid pointer UB.  Correct check
	before reading uleb length.  Warn on excess length.
This commit is contained in:
Alan Modra
2021-05-15 15:10:44 +09:30
parent b0d461ec37
commit 7848009791
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
binutils/ChangeLog
View File

@ -1,3 +1,8 @@
2021-05-15 Alan Modra <amodra@gmail.com>
* dwarf.c (display_loc_list): Avoid pointer UB. Correct check
before reading uleb length. Warn on excess length.
2021-05-15 Alan Modra <amodra@gmail.com> 2021-05-15 Alan Modra <amodra@gmail.com>
* dwarf.c (display_debug_macro): Print strings that might not * dwarf.c (display_debug_macro): Print strings that might not

20
binutils/dwarf.c
View File

@ -6355,7 +6355,7 @@ display_loc_list (struct dwarf_section *section,
dwarf_vma off = offset + (start - *start_ptr); dwarf_vma off = offset + (start - *start_ptr);
dwarf_vma vbegin = vm1, vend = vm1; dwarf_vma vbegin = vm1, vend = vm1;
if (start + 2 * pointer_size > section_end) if (2 * pointer_size > (size_t) (section_end - start))
{ {
warn (_("Location list starting at offset 0x%lx is not terminated.\n"), warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
(unsigned long) offset); (unsigned long) offset);
@ -6408,7 +6408,7 @@ display_loc_list (struct dwarf_section *section,
(unsigned long) off, 8, ""); (unsigned long) off, 8, "");
} }
if (start + 2 > section_end) if (2 > (size_t) (section_end - start))
{ {
warn (_("Location list starting at offset 0x%lx is not terminated.\n"), warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
(unsigned long) offset); (unsigned long) offset);
@ -6417,7 +6417,7 @@ display_loc_list (struct dwarf_section *section,
SAFE_BYTE_GET_AND_INC (length, start, 2, section_end); SAFE_BYTE_GET_AND_INC (length, start, 2, section_end);
if (start + length > section_end) if (length > (size_t) (section_end - start))
{ {
warn (_("Location list starting at offset 0x%lx is not terminated.\n"), warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
(unsigned long) offset); (unsigned long) offset);
@ -6579,15 +6579,21 @@ display_loclists_list (struct dwarf_section *section,
&& llet != DW_LLE_start_length) && llet != DW_LLE_start_length)
continue; continue;
if (start + 2 > section_end) if (start == section_end)
{ {
warn (_("Location list starting at offset 0x%lx is not terminated.\n"), warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
(unsigned long) offset); (unsigned long) offset);
break; break;
} }
READ_ULEB (length, start, section_end); READ_ULEB (length, start, section_end);
if (length > (size_t) (section_end - start))
{
warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
(unsigned long) offset);
break;
}
print_dwarf_vma (begin, pointer_size); print_dwarf_vma (begin, pointer_size);
print_dwarf_vma (end, pointer_size); print_dwarf_vma (end, pointer_size);
@ -6751,7 +6757,7 @@ display_loc_list_dwo (struct dwarf_section *section,
return; return;
} }
if (start + 2 > section_end) if (2 > (size_t) (section_end - start))
{ {
warn (_("Location list starting at offset 0x%lx is not terminated.\n"), warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
(unsigned long) offset); (unsigned long) offset);
@ -6759,7 +6765,7 @@ display_loc_list_dwo (struct dwarf_section *section,
} }
SAFE_BYTE_GET_AND_INC (length, start, 2, section_end); SAFE_BYTE_GET_AND_INC (length, start, 2, section_end);
if (start + length > section_end) if (length > (size_t) (section_end - start))
{ {
warn (_("Location list starting at offset 0x%lx is not terminated.\n"), warn (_("Location list starting at offset 0x%lx is not terminated.\n"),
(unsigned long) offset); (unsigned long) offset);