Fix elf64DynMode.

Since Ubuntu 22.04 Address Space Layout Randomization is active, so it's
needed to be taken into account when you want to hook dynamic functions.

Author: Vipon

cTools/libs/binDynMod/elfDynMod/elf32DynMod.c

@@ -55,6 +55,9 @@ void *elf32Hook(const Elf32File *elf32, const char *func, const void *hand)
     }
 
     uint32_t relpltAmount = relplt->sh_size / sizeof(Elf32Rel);
+    Elf32Sym *hook_sym = elf32GetSymByName(elf32, "elf32Hook");
+    uint32_t func_original_addr = elf32GetSSymAddr(hook_sym);
+    uint32_t func_addr_diff = (uint32_t)(size_t)(void*)&elf32Hook - func_original_addr;
 
     /***
      * r_info        -   This member gives both the symbol table index,
@@ -71,9 +74,10 @@ void *elf32Hook(const Elf32File *elf32, const char *func, const void *hand)
     uint32_t i = 0;
     for (i = 0; i < relpltAmount; ++i)
         if (ELF32_R_SYM(elf32->relaplt[i].r_info) == symbolIndex){
-            // !TODO: need refactor
-            relAddr = (void*) (size_t)*(uint32_t*) (size_t)elf32->relaplt[i].r_offset;
-            *(uint32_t*) (size_t)(elf32->relaplt[i].r_offset) = (uint32_t)(uint64_t) hand;
+            uint32_t offset = elf32->relaplt[i].r_offset;
+            uint32_t* addr = (uint32_t*)(size_t)(func_addr_diff + offset);
+            relAddr = (void*)(size_t) *addr;
+            *addr = (uint32_t)(size_t) hand;
 
             return relAddr;
         }

cTools/libs/binDynMod/elfDynMod/elf64DynMod.c

@@ -55,6 +55,9 @@ void *elf64Hook(const Elf64File *elf64, const char *func, const void *hand)
     }
 
     uint64_t relpltAmount = relplt->sh_size / sizeof(Elf64Rel);
+    Elf64Sym *hook_sym = elf64GetSymByName(elf64, "elf64Hook");
+    uint64_t func_original_addr = elf64GetSSymAddr(hook_sym);
+    uint64_t func_addr_diff = (uint64_t)&elf64Hook - func_original_addr;
 
     /***
      * r_info        -   This member gives both the symbol table index,
@@ -71,8 +74,10 @@ void *elf64Hook(const Elf64File *elf64, const char *func, const void *hand)
     uint64_t i = 0;
     for (i = 0; i < relpltAmount; ++i)
         if (ELF64_R_SYM(elf64->relaplt[i].r_info) == symbolIndex){
-            relAddr = (void*) *(uint64_t*) elf64->relaplt[i].r_offset;
-            *(uint64_t*) (elf64->relaplt[i].r_offset) = (uint64_t) hand;
+            uint64_t offset = elf64->relaplt[i].r_offset;
+            uint64_t* addr = (uint64_t*)(func_addr_diff + offset);
+            relAddr = (void*) *addr;
+            *addr = (uint64_t) hand;
 
             return relAddr;
         }

shellTools/os/libos.sh shellTools/os/libOs.shshellTools/os/libos.sh renamed to shellTools/os/libOs.sh

@@ -23,7 +23,7 @@
 # SOFTWARE.
 
 SCRIPT_DIR="$(realpath $(dirname "${BASH_SOURCE[0]}"))"
-source "${SCRIPT_DIR}/../../os/libos.sh"
+source "${SCRIPT_DIR}/../../os/libOs.sh"
 
 ROOT="$(realpath $(dirname "${BASH_SOURCE[0]}"))"
 BUILD_DIR="${ROOT}/vim/src"