sinjuginas/rpm-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

debugedit: Check .debug_str index is valid before use.

Browse Source 
debugedit would blindly use an .debug_str index from the .debug_info or
.debug_line sections assuming it would result in a valid string. Which
would crash and burn if the DWARF data was bogus when the string was
used. So check whenever converting an string index into a char pointer
so we can produce a more helpful error message.

https://bugzilla.redhat.com/show_bug.cgi?id=1543912

Signed-off-by: Mark Wielaard <mark@klomp.org>
This commit is contained in:
Mark Wielaard 2018-03-07 16:25:31 +01:00 committed by Panu Matilainen
parent d50520d94e
commit df15b0d018
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/debugedit.c
View File

@ -820,6 +820,9 @@ record_file_string_entry_idx (struct strings *strings, size_t old_idx)
struct stridxentry *entry = string_find_new_entry (strings, old_idx);
if (entry != NULL)
{
if (old_idx >= debug_sections[DEBUG_STR].size)
error (1, 0, "Bad string pointer index %zd", old_idx);
Strent *strent;
const char *old_str = (char *)debug_sections[DEBUG_STR].data + old_idx;
const char *file = skip_dir_prefix (old_str, base_dir);
@ -870,6 +873,9 @@ record_existing_string_entry_idx (struct strings *strings, size_t old_idx)
struct stridxentry *entry = string_find_new_entry (strings, old_idx);
if (entry != NULL)
{
if (old_idx >= debug_sections[DEBUG_STR].size)
error (1, 0, "Bad string pointer index %zd", old_idx);
const char *str = (char *)debug_sections[DEBUG_STR].data + old_idx;
Strent *strent = strtab_add_len (strings->str_tab,
str, strlen (str) + 1);
@ -1533,6 +1539,10 @@ edit_attributes (DSO *dso, unsigned char *ptr, struct abbrev_tag *t, int phase)
{
const char *dir;
size_t idx = do_read_32_relocated (ptr);
if (idx >= debug_sections[DEBUG_STR].size)
error (1, 0,
"%s: Bad string pointer index %zd for comp_dir",
dso->filename, idx);
dir = (char *) debug_sections[DEBUG_STR].data + idx;
free (comp_dir);
@ -1558,6 +1568,10 @@ edit_attributes (DSO *dso, unsigned char *ptr, struct abbrev_tag *t, int phase)
case. */
char *name;
size_t idx = do_read_32_relocated (ptr);
if (idx >= debug_sections[DEBUG_STR].size)
error (1, 0,
"%s: Bad string pointer index %zd for unit name",
dso->filename, idx);
name = (char *) debug_sections[DEBUG_STR].data + idx;
if (*name == '/' && comp_dir == NULL)
{