commit 334bdf88ea1ff0877605e1a44ed31eaff18b2e14
author Eugene Tarassov <eugenet@xilinx.com> Fri Sep 28 09:37:18 2018 -0700
committer Eugene Tarassov <eugenet@xilinx.com> Fri Sep 28 09:38:14 2018 -0700
tree 31ff538a480ff972cc0d1752be18d6a9db7cdf24
parent a9eb5539cb524548f9a95b52504f4cc5a3cd3b80

TCF Agent: find_test_symbol() returns wrong address because of ASLR on Linux

Address space layout randomization (ASLR) makes addresses different after fork + execl

agent/tcf/main/test.c

diff --git a/agent/tcf/main/test.c b/agent/tcf/main/test.c
index d355405..49a2063 100644
--- a/agent/tcf/main/test.c
+++ b/agent/tcf/main/test.c
@@ -21,6 +21,10 @@
 
 #if ENABLE_RCBP_TEST
 
+#ifndef ENABLE_TestSymbols
+#  define ENABLE_TestSymbols (SERVICE_Expressions && !ENABLE_ELF)
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
@@ -261,9 +265,10 @@
 }
 
 int find_test_symbol(Context * ctx, const char * name, void ** addr, int * sym_class) {
+#if ENABLE_TestSymbols
     /* This code allows to run TCF diagnostic tests when symbols info is not available */
+    *addr = NULL;
     if (is_test_process(ctx) && strncmp(name, "tcf_test_", 9) == 0) {
-        *addr = NULL;
         if (strcmp(name, "tcf_test_array") == 0) {
             *sym_class = SYM_CLASS_REFERENCE;
             *addr = &tcf_test_array;
@@ -282,6 +287,7 @@
         }
         if (*addr != NULL) return 0;
     }
+#endif
     errno = ERR_SYM_NOT_FOUND;
     return -1;
 }
@@ -350,7 +356,7 @@
         int fd = sysconf(_SC_OPEN_MAX);
         while (fd > 3) close(--fd);
         if (context_attach_self() < 0) exit(1);
-#if defined(__linux__)
+#if defined(__linux__) && !ENABLE_TestSymbols
         {
             char buf[32];
             char * fnm = NULL;