Update & fixes

Author: MJx0

AndKittyInjector/src/Injector/KittyInjector.cpp

@@ -259,7 +259,7 @@ injected_info_t KittyInjector::nativeInject(KittyIOFile& lib, int flags, bool us
 
     auto memfd_dlopen = [&]() -> bool
     {
-        std::string memfd_rand = KittyUtils::random_string(KittyUtils::randInt(5, 12));
+        std::string memfd_rand = KittyUtils::String::Random(KittyUtils::randInt(5, 12));
         KITTY_LOGI("nativeInject: memfd_rand(%d) = %s.", int(memfd_rand.length()), memfd_rand.c_str());
 
         uintptr_t rmemfd_name = _remote_syscall.rmmap_str(memfd_rand);
@@ -276,7 +276,7 @@ injected_info_t KittyInjector::nativeInject(KittyIOFile& lib, int flags, bool us
             return false;
         }
 
-        std::string rmemfdPath = KittyUtils::strfmt("/proc/%d/fd/%d", _kMgr->processID(), rmemfd);
+        std::string rmemfdPath = KittyUtils::String::Fmt("/proc/%d/fd/%d", _kMgr->processID(), rmemfd);
         KittyIOFile rmemfdFile(rmemfdPath, O_RDWR);
         if (!rmemfdFile.Open())
         {
@@ -356,7 +356,7 @@ injected_info_t KittyInjector::emuInject(KittyIOFile& lib, int flags, bool use_d
     if (use_dl_memfd)
     {
         do {
-            std::string memfd_rand = KittyUtils::random_string(KittyUtils::randInt(5, 12));
+            std::string memfd_rand = KittyUtils::String::Random(KittyUtils::randInt(5, 12));
             memfdName = "/memfd:" + memfd_rand;
             KITTY_LOGI("emuInject: memfd_rand(%d) = %s.", int(memfd_rand.length()), memfd_rand.c_str());
 
@@ -374,7 +374,7 @@ injected_info_t KittyInjector::emuInject(KittyIOFile& lib, int flags, bool use_d
                 break;
             }
 
-            std::string rmemfdPath = KittyUtils::strfmt("/proc/%d/fd/%d", _kMgr->processID(), rmemfd);
+            std::string rmemfdPath = KittyUtils::String::Fmt("/proc/%d/fd/%d", _kMgr->processID(), rmemfd);
             KittyIOFile rmemfdFile(rmemfdPath, O_RDWR);
             if (!rmemfdFile.Open())
             {
@@ -621,7 +621,7 @@ bool KittyInjector::hideSegmentsFromMaps(injected_info_t &injected)
     {
         if (it.pathname.empty()) continue;
 
-        /* if (KittyUtils::string_contains(it.pathname, ".bss]"))
+        /* if (KittyUtils::String::Contains(it.pathname, ".bss]"))
         {
             KITTY_LOGI("hideSegments: Spoofing .bss %p - %p", (void*)it.startAddress, (void*)it.endAddress);
             uintptr_t rstr = _remote_syscall.rmmap_str("anon:Mem_0x10000004");

AndKittyInjector/src/Injector/SoInfoPatch.hpp

@@ -183,7 +183,7 @@ class SoInfoPatch
             bool check1 = (it.is_rw && it.startAddress >= nb_impl_elf.bss() && it.endAddress <= (nb_impl_elf.bss()+nb_impl_elf.bssSize()));
 
             // search in "[anon:Mem_x]" read-only regions
-            bool check2 = (it.is_ro && KittyUtils::string_startswith(it.pathname, "[anon:Mem_"));
+            bool check2 = (it.is_ro && KittyUtils::String::StartsWith(it.pathname, "[anon:Mem_"));
 
             // search in "[anon:linker_alloc]" read-only regions
             bool check3 = (it.is_ro && it.pathname == "[anon:linker_alloc]");
@@ -227,13 +227,10 @@ class SoInfoPatch
                 return results;
         }
 
-        for (auto& it : maps)
+        // search in nb implementation rw regions
+        for (auto& it : nb_impl_elf.segments())
         {
-            if (!it.is_private || it.length < 0xFFFF)
-                continue;
-
-            // search in nb implementation rw regions
-            if (!(it.is_rw && it.startAddress >= nb_impl_elf.base() && it.endAddress <= nb_impl_elf.end()))
+            if (!it.is_private || !it.is_rw)
                 continue;
 
             auto results = _kMgr->memScanner.findDataAll(it.startAddress, it.endAddress, &si, sizeof(si));
@@ -286,14 +283,14 @@ class SoInfoPatch
                 if (sohead_elf.isValid() && it.startAddress >= sohead_elf.base())
                     continue;
 
-                if (!KittyUtils::string_contains(it.pathname, arch))
+                if (!KittyUtils::String::Contains(it.pathname, arch))
                     continue;
 
                 auto fileName = KittyUtils::fileNameFromPath(it.pathname);
                 auto fileExtension = KittyUtils::fileExtension(it.pathname);
 
                 bool is_libc = fileName == "libc.so";
-                bool is_app_process = fileExtension.empty() && KittyUtils::string_startswith(fileName, "app_process");
+                bool is_app_process = fileExtension.empty() && KittyUtils::String::StartsWith(fileName, "app_process");
 
                 if (!is_libc && !is_app_process)
                     continue;
@@ -307,11 +304,11 @@ class SoInfoPatch
                 sohead_elf = tmp;
             }
 
-            // our injected elf is loaded before libc / app_process ?
-            if (!sohead_elf.isValid() || sohead_elf.base() > elf.base())
+            // nb libc / app_process not loaded yet.
+            if (!sohead_elf.isValid())
             {
                 // don't have solution for this yet, increase injection delay for now
-                KITTY_LOGE("SoInfoPatch: Failed to remove elf(%p) (first in solist).", (void*)elf.base());
+                KITTY_LOGE("SoInfoPatch: Failed to find sohead ELF.");
                 return false;
             }
 
@@ -363,7 +360,7 @@ class SoInfoPatch
 
         if (!trav)
         {
-            KITTY_LOGE("SoInfoPatch: elf(%p) is not in solist.", (void*)elf.base());  
+            KITTY_LOGE("SoInfoPatch: elf(%p) is not in solist or was loaded before sohead.", (void*)elf.base());  
             return false;
         }
 

AndKittyInjector/src/main.cpp

@@ -317,7 +317,7 @@ void watch_proc_inject(const std::string& pkg, const std::string& lib,
     }
 
     // inject on any event that isn't related to fd or timer
-    auto proc_dir = KittyUtils::strfmt("/proc/%d", pid);
+    auto proc_dir = KittyUtils::String::Fmt("/proc/%d", pid);
     int proc_dir_watch = sync_watch_callback(proc_dir, IN_ALL_EVENTS,
         [&](int, struct inotify_event* iev) -> bool {
 
@@ -334,7 +334,7 @@ void watch_proc_inject(const std::string& pkg, const std::string& lib,
 
     // maybe check cmdline if zygote or <preinitalized>
     // std::string cmdline;
-    // KittyIOFile::readFileToString(KittyUtils::strfmt("/proc/%d/cmdline", pid), &cmdline);
+    // KittyIOFile::readFileToString(KittyUtils::String::Fmt("/proc/%d/cmdline", pid), &cmdline);
     // KITTY_LOGI("cmdline %s", cmdline.c_str());
 
     if (proc_dir_watch <= 0) {