This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
gold patch committed: Correct handling of writable .eh_frame section
- From: Ian Lance Taylor <iant at google dot com>
- To: binutils at sourceware dot org
- Date: Sat, 18 Jun 2011 15:31:51 -0700
- Subject: gold patch committed: Correct handling of writable .eh_frame section
This gold patch corrects the handling of a writable .eh_frame section by
making sure that the writable .eh_frame winds up as a relro section.
This fixes PR 12745. Committed to mainline.
Ian
2011-06-18 Ian Lance Taylor <iant@google.com>
PR gold/12745
* layout.cc (Layout::layout_eh_frame): Correct handling of
writable .eh_frame section.
Index: layout.cc
===================================================================
RCS file: /cvs/src/src/gold/layout.cc,v
retrieving revision 1.200
diff -u -p -r1.200 layout.cc
--- layout.cc 17 Jun 2011 13:00:01 -0000 1.200
+++ layout.cc 18 Jun 2011 22:27:02 -0000
@@ -1140,6 +1140,8 @@ Layout::layout_eh_frame(Sized_relobj_fil
gold_assert(this->eh_frame_section_ == os);
+ elfcpp::Elf_Xword orig_flags = os->flags();
+
if (!parameters->incremental()
&& this->eh_frame_data_->add_ehframe_input_section(object,
symbols,
@@ -1153,8 +1155,12 @@ Layout::layout_eh_frame(Sized_relobj_fil
os->update_flags_for_input_section(shdr.get_sh_flags());
// A writable .eh_frame section is a RELRO section.
- if ((shdr.get_sh_flags() & elfcpp::SHF_WRITE) != 0)
- os->set_is_relro();
+ if ((orig_flags & (elfcpp::SHF_WRITE | elfcpp::SHF_EXECINSTR))
+ != (os->flags() & (elfcpp::SHF_WRITE | elfcpp::SHF_EXECINSTR)))
+ {
+ os->set_is_relro();
+ os->set_order(ORDER_RELRO);
+ }
// We found a .eh_frame section we are going to optimize, so now
// we can add the set of optimized sections to the output
@@ -1176,6 +1182,10 @@ Layout::layout_eh_frame(Sized_relobj_fil
*off = os->add_input_section(this, object, shndx, name, shdr, reloc_shndx,
saw_sections_clause);
this->have_added_input_section_ = true;
+
+ if ((orig_flags & (elfcpp::SHF_WRITE | elfcpp::SHF_EXECINSTR))
+ != (os->flags() & (elfcpp::SHF_WRITE | elfcpp::SHF_EXECINSTR)))
+ os->set_order(this->default_section_order(os, false));
}
return os;