From c0b3066cbf06e71e91d348745145825b71c7d68d Mon Sep 17 00:00:00 2001
From: Matthew McGill <mhollismcgill@gmail.com>
Date: Fri, 1 Feb 2019 22:53:09 +0000
Subject: [PATCH] gnu.version fix but still code duplication
Former-commit-id: 38b0768ef4dad221621820b8dc60e619c12eee70
---
tools/selective_cfi/scfi_instr.cpp | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/tools/selective_cfi/scfi_instr.cpp b/tools/selective_cfi/scfi_instr.cpp
index fac3a4c11..25dd3f27e 100644
--- a/tools/selective_cfi/scfi_instr.cpp
+++ b/tools/selective_cfi/scfi_instr.cpp
@@ -1284,6 +1284,9 @@ void SCFI_Instrument::add_got_entry(const std::string& name)
auto relaplt_scoop=find_scoop(firp,".rela.dyn coalesced w/.rela.plt");
auto relplt_scoop=find_scoop(firp,".rel.dyn coalesced w/.rel.plt");
auto relscoop=relaplt_scoop!=NULL ? relaplt_scoop : relplt_scoop;
+ auto gnu_version_scoop=find_scoop(firp,".gnu.version");
+ assert(gnu_version_scoop);
+ assert(gnu_version_scoop->getStart()->getVirtualOffset()==0);
// add 0-init'd pointer to table
string new_got_entry_str(ptrsize,0); // zero-init a pointer-sized string
@@ -1319,6 +1322,10 @@ void SCFI_Instrument::add_got_entry(const std::string& name)
string dl_sym_str((const char*)&dl_sym, sizeof(T_Elf_Sym));
unsigned int dl_pos=add_to_scoop(dl_sym_str,dynsym_scoop);
+ // update the gnu.version section so that the new symbol has a version.
+ const auto new_version_str=string("\0\0", 2); // \0\0 means *local*, as in, don't index the gnu.verneeded array.
+ add_to_scoop(new_version_str,gnu_version_scoop);
+
// find the rela count. can't insert before that.
int rela_count=0;
for(int i=0;i+sizeof(T_Elf_Dyn)<dynamic_scoop->getSize(); i+=sizeof(T_Elf_Dyn))
--
GitLab