JakeHillion/drgn
1
0
Fork 0
mirror of https://github.com/JakeHillion/drgn.git synced 2024-12-22 17:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

libdrgn: dwarf_info: unify .debug_str_offsets base out of bounds error

Browse Source 
Preparation for dwp support (#317).

Signed-off-by: Omar Sandoval <osandov@osandov.com>
This commit is contained in:
Omar Sandoval 2023-11-06 21:52:06 -08:00
parent 7565538bde
commit a29aa45758
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libdrgn/dwarf_info.c
View File

@ -521,14 +521,6 @@ drgn_dwarf_index_read_cus(struct drgn_dwarf_index_state *state,
if (dwarf_formudata(attr, if (dwarf_formudata(attr,
&str_offsets_base)) &str_offsets_base))
return drgn_error_libdw(); return drgn_error_libdw();
if (str_offsets_base
> debug_str_offsets->d_size) {
return drgn_elf_file_section_error(cu_file,
cu_file->scns[scn],
cu_file->scn_data[scn],
(char *)attr->valp,
"DW_AT_str_offsets_base is out of bounds");
}
} else { } else {
// The default str_offsets_base is the // The default str_offsets_base is the
// first entry in .debug_str_offsets // first entry in .debug_str_offsets
@ -537,22 +529,19 @@ drgn_dwarf_index_read_cus(struct drgn_dwarf_index_state *state,
// specification, but it seems to be the // specification, but it seems to be the
// consensus.) // consensus.)
str_offsets_base = 2 * offset_size; str_offsets_base = 2 * offset_size;
if (str_offsets_base
> debug_str_offsets->d_size) {
return drgn_elf_file_section_error(cu_file,
cu_file->scns[DRGN_SCN_DEBUG_STR_OFFSETS],
debug_str_offsets,
(char *)debug_str_offsets->d_buf
+ debug_str_offsets->d_size,
".debug_str_offsets is too small");
}
} }
} else { } else {
// GNU Debug Fission doesn't have // GNU Debug Fission doesn't have
// DW_AT_str_offsets_base; the base is always 0. // DW_AT_str_offsets_base; the base is always 0.
str_offsets_base = 0; str_offsets_base = 0;
} }
if (str_offsets_base > debug_str_offsets->d_size) {
return drgn_elf_file_section_error(cu_file,
cu_file->scns[scn],
cu_file->scn_data[scn],
cudie.addr,
".debug_str_offsets base is out of bounds");
}
str_offsets = str_offsets =
(char *)debug_str_offsets->d_buf (char *)debug_str_offsets->d_buf
+ str_offsets_base; + str_offsets_base;