This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb/binutils-2_28-branch] Fix ld uninitialized read of script ASSERT data structure
- From: Alan Modra <amodra at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 7 Mar 2017 04:33:27 -0000
- Subject: [binutils-gdb/binutils-2_28-branch] Fix ld uninitialized read of script ASSERT data structure
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=354199c7692c1bed53a2a15f0e4d531457e95f17
commit 354199c7692c1bed53a2a15f0e4d531457e95f17
Author: Alan Modra <amodra@gmail.com>
Date: Tue Mar 7 12:20:00 2017 +1030
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.
Diff:
---
ld/ChangeLog | 5 +++++
ld/ldlang.c | 3 ++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/ld/ChangeLog b/ld/ChangeLog
index fd3e232..f4fda0c 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -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-02 Tristan Gingold <gingold@adacore.com>
* configure: Regenerate.
diff --git a/ld/ldlang.c b/ld/ldlang.c
index dafc348..54f160c 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -3377,7 +3377,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;