[IMPROVE] add handling IFUNC for ld_probes

Change-Id: I1cb6563d6ea0cfdd06574dc70e1f17d25f3017d5
Signed-off-by: Vyacheslav Cherkashin <v.cherkashin@samsung.com>

diff --git a/daemon/Makefile b/daemon/Makefile
index 46f363b..cc3eb6d 100644 (file)
--- a/daemon/Makefile
+++ b/daemon/Makefile
@@ -71,7 +71,8 @@ LDFLAGS := \
        -lsmack \
        -lecore \
        -lcapi-system-info \
-       -lparserelf
+       -lparserelf \
+       -ldl
 
 # CALL_MNGR
 ifeq ($(CALL_MNGR),y)

diff --git a/daemon/da_protocol_inst.c b/daemon/da_protocol_inst.c
index be7b766..a31c200 100644 (file)
--- a/daemon/da_protocol_inst.c
+++ b/daemon/da_protocol_inst.c
@@ -24,6 +24,9 @@
  *
  */
 
+#define _GNU_SOURCE
+#include <link.h>
+#include <dlfcn.h>
 #include "swap_debug.h"
 #include "da_protocol.h"
 #include "da_protocol_inst.h"
@@ -447,6 +450,41 @@ struct ld_preload_probe_t {
        uint8_t preload_type;
 } __attribute__ ((packed));
 
+static unsigned long dl_get_addr(const char *lib_name, const char *func_name)
+{
+       void *handle;
+       struct link_map *map;
+       unsigned long addr = 0;
+       char *err;
+
+       handle = dlopen(lib_name, RTLD_LAZY);
+       if (handle == NULL) {
+               LOGE("handle not found (%s), error: %s\n", lib_name, dlerror());
+               return 0;
+       }
+
+       if (dlinfo(handle, RTLD_DI_LINKMAP, &map) == -1) {
+               LOGE("RTLD_DI_LINKMAP failed: %s\n", dlerror());
+               goto close_handle;
+       }
+
+       dlerror();      /* Clear any existing error */
+       addr = (unsigned long)dlsym(handle, func_name);
+
+       err = dlerror();
+       if (err) {
+               LOGE("dlerror(): %s\n", err);
+               addr = 0;
+               goto close_handle;
+       }
+
+       addr -= map->l_addr;
+
+close_handle:
+       dlclose(handle);
+       return addr;
+}
+
 static int feature_add_func_inst_list(struct ld_lib_list_el_t ld_lib,
                                      struct data_list_t *dest)
 {
@@ -464,7 +502,25 @@ static int feature_add_func_inst_list(struct ld_lib_list_el_t ld_lib,
 
        LOGI("app_int_num = %d\n", num);
        for (i = 0; i < num; i++) {
+               unsigned long orig_addr = ld_lib.probes[i].orig_addr;
+
                parse_deb("app_int #%d\n", i);
+
+               /* check IFUNC */
+               if (orig_addr == IFUNC_UNDEF_ADDR) {
+                       const char *lib_name = ld_lib.lib_name;
+                       const char *func_name = ld_lib.probes[i].name;
+
+                       orig_addr = dl_get_addr(lib_name, func_name);
+
+                       LOGI("IFUNC: [%08lx %s] %s\n", orig_addr, func_name, lib_name);
+                       if (orig_addr == 0)
+                               continue;
+
+                       /* set orig_addr */
+                       ld_lib.probes[i].orig_addr = orig_addr;
+               }
+
                probe_el = new_probe();
 
                if (probe_el == NULL) {
@@ -480,7 +536,7 @@ static int feature_add_func_inst_list(struct ld_lib_list_el_t ld_lib,
                        return 0;
                }
 
-               func->orig_addr = ld_lib.probes[i].orig_addr;
+               func->orig_addr = orig_addr;
                func->probe_type = SWAP_LD_PROBE;
                func->handler_addr = ld_lib.probes[i].handler_addr;
                func->preload_type = ld_lib.probes[i].probe_type;