Merge pull request #64 from Vipon/vkonyche/fix/ubuntu_24.04

Vkonyche/fix/ubuntu 24.04

Author: Vipon

.github/workflows/main.yml

@@ -136,7 +136,6 @@ jobs:
           cpath: ${HOME}/.local/include:${CPATH}
           library_path: ${HOME}/.local/lib:${LIBRARY_PATH}
       - run: ./setup.sh
-      - run: chmod 0744 "${HOME}/.local/bin/ninja"
       - name: Configure Debug Ninja
         run: ./configure --ninja --output ninja
       - name: Ninja Build Test Install
@@ -171,6 +170,38 @@ jobs:
         with:
           name: viponTools_Ubuntu
           path: viponTools.tar.gz
+  ubuntu-2404-32-gmake-release:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+      - name: Set Env Variables
+        uses: ./.github/actions/set_env_var
+        with:
+          shell: bash
+          path: ${HOME}/.local/bin
+          cpath: ${HOME}/.local/include:${CPATH}
+          library_path: ${HOME}/.local/lib:${LIBRARY_PATH}
+      - run: ./setup.sh
+      - name: Set up 32-bits build env
+        run: |
+          sudo dpkg --add-architecture i386
+          sudo apt update
+          sudo apt install build-essential gcc-multilib g++-multilib
+      - name: Configure Gmake Release
+        run: ./configure --gmake --release --target-platform=i386-linux-gnu --output i386_release
+      - name: Gmake Build Test Install
+        uses: ./.github/actions/gmake_build_test_install
+        with:
+          shell: bash
+          working-directory: i386_release
+      - name: Make Achive
+        working-directory: i386_release
+        run: tar -czvf ../viponTools.tar.gz viponTools
+      - uses: actions/upload-artifact@v4
+        with:
+          name: viponTools_Ubuntu_i386
+          path: viponTools.tar.gz
   windows-ninja-debug-static:
     runs-on: windows-2025-vs2026
     steps:

cTools/libs/CMakeLists.txt

@@ -31,10 +31,13 @@ add_subdirectory(binParse)
 add_subdirectory(binPrinter)
 add_subdirectory(binDynMod)
 if (NOT APPLE)
-add_subdirectory(perfAnalysis)
+  add_subdirectory(perfAnalysis)
 endif (NOT APPLE)
 add_subdirectory(test)
-add_subdirectory(x86_64)
-add_subdirectory(arch)
-add_subdirectory(mod)
+if (NOT "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i386")
+  # !TODO: Need to solve problem with capstone and keystone 32 bits build
+  add_subdirectory(x86_64)
+  add_subdirectory(arch)
+  add_subdirectory(mod)
+endif()
 

cTools/libs/binDynMod/elfDynMod/elf32DynMod.c

@@ -1,7 +1,7 @@
 /***
  * MIT License
  *
- * Copyright (c) 2023 Konychev Valerii
+ * Copyright (c) 2023-2026 Konychev Valerii
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -48,13 +48,16 @@ void *elf32Hook(const Elf32File *elf32, const char *func, const void *hand)
      * shSize      -   contains the size, in bytes, of the section.
      * relpltAmount-   amount of Elf32Rel structures in .rela.ptl section.
      */
-    Elf32Shdr *relplt = elf32GetSectByName(elf32, RELAPLT);
+    Elf32Shdr *relplt = elf32GetSectByName(elf32, RELPLT);
     if (relplt == NULL) {
-        LOG_ERROR("Cannot get the section " RELAPLT);
+        LOG_ERROR("Cannot get the section " RELPLT);
         return NULL;
     }
 
     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,
@@ -69,14 +72,16 @@ void *elf32Hook(const Elf32File *elf32, const char *func, const void *hand)
      */
     void *relAddr = NULL;
     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;
+    for (i = 0; i < relpltAmount; ++i) {
+        if (((uint32_t)ELF32_R_SYM(elf32->relplt[i].r_info)) == symbolIndex) {
+            uint32_t offset = elf32->relplt[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;
         }
+    }
 
     return NULL;
 }

cTools/libs/binDynMod/elfDynMod/elf64DynMod.c

@@ -1,7 +1,7 @@
 /***
  * MIT License
  *
- * Copyright (c) 2023 Konychev Valerii
+ * Copyright (c) 2023-2026 Konychev Valerii
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -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;
         }