diff options
| author | Evgenii Stepanov <eugenis@google.com> | 2017-01-18 23:39:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-01-18 23:39:08 +0000 |
| commit | 082bec5b419806d694f9a7d0283b2f831d52eea4 (patch) | |
| tree | 4902863a691f86e4e5236344d11ef172d2f8a2c5 /linker/linker_main.cpp | |
| parent | 2d261e8e9e1340151698086e8434f312a73f77f0 (diff) | |
| parent | 0a3637d3eb2424d8e825ad1825f843450a888406 (diff) | |
| download | android_bionic-082bec5b419806d694f9a7d0283b2f831d52eea4.tar.gz android_bionic-082bec5b419806d694f9a7d0283b2f831d52eea4.tar.bz2 android_bionic-082bec5b419806d694f9a7d0283b2f831d52eea4.zip | |
Merge "Runtime support for CFI"
Diffstat (limited to 'linker/linker_main.cpp')
| -rw-r--r-- | linker/linker_main.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/linker/linker_main.cpp b/linker/linker_main.cpp index d5bb457cf..9ed750536 100644 --- a/linker/linker_main.cpp +++ b/linker/linker_main.cpp @@ -29,6 +29,7 @@ #include "linker_main.h" #include "linker_debug.h" +#include "linker_cfi.h" #include "linker_gdb_support.h" #include "linker_globals.h" #include "linker_phdr.h" @@ -368,6 +369,10 @@ static ElfW(Addr) __linker_init_post_relocation(KernelArgumentBlock& args, ElfW( add_vdso(args); + if (!get_cfi_shadow()->InitialLinkDone(solist)) { + __libc_fatal("CANNOT LINK EXECUTABLE \"%s\": %s", g_argv[0], linker_get_error_buffer()); + } + { ProtectedDataGuard guard; |