OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix ld uninitialized read of script ASSERT data structure 

lang_assignment_statement serves both assignments and asserts.

	* ldlang.c (open_input_bfds): Check that lang_assignment_statement
	is not an assert before referencing defsym.
This commit is contained in:
Alan Modra 2017-03-07 12:20:00 +10:30
parent b1b07054c0
commit d933941d6c
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ld/ChangeLog
View File

@ -1,3 +1,8 @@
2017-03-07 Alan Modra <amodra@gmail.com>
* ldlang.c (open_input_bfds): Check that lang_assignment_statement
is not an assert before referencing defsym.
2017-03-05 Alan Modra <amodra@gmail.com>
* testsuite/ld-elf/eh3.d: Adjust for eh_frame alignment change.

3
ld/ldlang.c
View File

@ -3374,7 +3374,8 @@ open_input_bfds (lang_statement_union_type *s, enum open_bfd_mode mode)
#endif
break;
case lang_assignment_statement_enum:
if (s->assignment_statement.exp->assign.defsym)
if (s->assignment_statement.exp->type.node_class != etree_assert
&& s->assignment_statement.exp->assign.defsym)
/* This is from a --defsym on the command line. */
exp_fold_tree_no_dot (s->assignment_statement.exp);
break;