frida 16.6.6 → 16.7.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frida",
-  "version": "16.6.6",
+  "version": "16.7.3",
   "authors": [
     "Frida Developers"
   ],

package/releng/deps.toml

@@ -1,6 +1,6 @@
 [dependencies]
-version = "20250114"
-bootstrap_version = "20250109"
+version = "20250321"
+bootstrap_version = "20250114"
 
 [ninja]
 scope = "toolchain"
@@ -102,15 +102,6 @@ dependencies = [
                               """ }
 ]
 
-[elfutils]
-when = "machine.os in {'linux', 'android', 'qnx'}"
-name = "elfutils"
-version = "1284bbc128473aea220337685985d465607fbac8"
-url = "https://github.com/frida/elfutils.git"
-dependencies = [
-    "zlib",
-]
-
 [libdwarf]
 when = "machine.os in {'linux', 'android', 'freebsd', 'qnx'}"
 name = "libdwarf"
@@ -119,9 +110,6 @@ url = "https://github.com/frida/libdwarf.git"
 options = [
     "-Ddecompression=false",
 ]
-dependencies = [
-    { id = "elfutils", when = "machine.os != 'freebsd'" },
-]
 
 [xz]
 name = "XZ Utils"
@@ -374,12 +362,13 @@ options = [
 [v8]
 when = """ \
        machine.config != 'mingw' \
+       and machine.arch != 'arm64beilp32' \
        and not machine.arch.startswith('mips') \
        and not machine.arch.startswith('powerpc') \
        and machine.os != 'qnx' \
        """
 name = "V8"
-version = "9492bfc5ca8615be651b85336caafa8f3c730cd7"
+version = "a7b09c3d8b16199ef8664c66559d2530c293b8cf"
 url = "https://github.com/frida/v8.git"
 options = [
     "-Ddebug=false",

package/releng/devkit-assets/frida-gum-example-unix.c

@@ -3,13 +3,11 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-typedef struct _ExampleListener ExampleListener;
+typedef struct _ExampleListenerData ExampleListenerData;
 typedef enum _ExampleHookId ExampleHookId;
 
-struct _ExampleListener
+struct _ExampleListenerData
 {
-  GObject parent;
-
   guint num_calls;
 };
 
@@ -19,51 +17,48 @@ enum _ExampleHookId
   EXAMPLE_HOOK_CLOSE
 };
 
-static void example_listener_iface_init (gpointer g_iface, gpointer iface_data);
-
-#define EXAMPLE_TYPE_LISTENER (example_listener_get_type ())
-G_DECLARE_FINAL_TYPE (ExampleListener, example_listener, EXAMPLE, LISTENER, GObject)
-G_DEFINE_TYPE_EXTENDED (ExampleListener,
-                        example_listener,
-                        G_TYPE_OBJECT,
-                        0,
-                        G_IMPLEMENT_INTERFACE (GUM_TYPE_INVOCATION_LISTENER,
-                            example_listener_iface_init))
+static void example_listener_on_enter (GumInvocationContext * ic, gpointer user_data);
+static void example_listener_on_leave (GumInvocationContext * ic, gpointer user_data);
 
 int
 main (int argc,
       char * argv[])
 {
   GumInterceptor * interceptor;
+  ExampleListenerData * data;
   GumInvocationListener * listener;
 
   gum_init_embedded ();
 
   interceptor = gum_interceptor_obtain ();
-  listener = g_object_new (EXAMPLE_TYPE_LISTENER, NULL);
+
+  data = g_new0 (ExampleListenerData, 1);
+  listener = gum_make_call_listener (example_listener_on_enter, example_listener_on_leave, data, g_free);
 
   gum_interceptor_begin_transaction (interceptor);
   gum_interceptor_attach (interceptor,
-      GSIZE_TO_POINTER (gum_module_find_export_by_name (NULL, "open")),
+      GSIZE_TO_POINTER (gum_module_find_global_export_by_name ("open")),
       listener,
-      GSIZE_TO_POINTER (EXAMPLE_HOOK_OPEN));
+      GSIZE_TO_POINTER (EXAMPLE_HOOK_OPEN),
+      GUM_ATTACH_FLAGS_NONE);
   gum_interceptor_attach (interceptor,
-      GSIZE_TO_POINTER (gum_module_find_export_by_name (NULL, "close")),
+      GSIZE_TO_POINTER (gum_module_find_global_export_by_name ("close")),
       listener,
-      GSIZE_TO_POINTER (EXAMPLE_HOOK_CLOSE));
+      GSIZE_TO_POINTER (EXAMPLE_HOOK_CLOSE),
+      GUM_ATTACH_FLAGS_NONE);
   gum_interceptor_end_transaction (interceptor);
 
   close (open ("/etc/hosts", O_RDONLY));
   close (open ("/etc/fstab", O_RDONLY));
 
-  g_print ("[*] listener got %u calls\n", EXAMPLE_LISTENER (listener)->num_calls);
+  g_print ("[*] listener got %u calls\n", data->num_calls);
 
   gum_interceptor_detach (interceptor, listener);
 
   close (open ("/etc/hosts", O_RDONLY));
   close (open ("/etc/fstab", O_RDONLY));
 
-  g_print ("[*] listener still has %u calls\n", EXAMPLE_LISTENER (listener)->num_calls);
+  g_print ("[*] listener still has %u calls\n", data->num_calls);
 
   g_object_unref (listener);
   g_object_unref (interceptor);
@@ -74,11 +69,13 @@ main (int argc,
 }
 
 static void
-example_listener_on_enter (GumInvocationListener * listener,
-                           GumInvocationContext * ic)
+example_listener_on_enter (GumInvocationContext * ic,
+                           gpointer user_data)
 {
-  ExampleListener * self = EXAMPLE_LISTENER (listener);
-  ExampleHookId hook_id = GUM_IC_GET_FUNC_DATA (ic, ExampleHookId);
+  ExampleListenerData * data = user_data;
+  ExampleHookId hook_id;
+
+  hook_id = GUM_IC_GET_FUNC_DATA (ic, ExampleHookId);
 
   switch (hook_id)
   {
@@ -90,33 +87,11 @@ example_listener_on_enter (GumInvocationListener * listener,
       break;
   }
 
-  self->num_calls++;
-}
-
-static void
-example_listener_on_leave (GumInvocationListener * listener,
-                           GumInvocationContext * ic)
-{
-}
-
-static void
-example_listener_class_init (ExampleListenerClass * klass)
-{
-  (void) EXAMPLE_IS_LISTENER;
-  (void) glib_autoptr_cleanup_ExampleListener;
-}
-
-static void
-example_listener_iface_init (gpointer g_iface,
-                             gpointer iface_data)
-{
-  GumInvocationListenerInterface * iface = g_iface;
-
-  iface->on_enter = example_listener_on_enter;
-  iface->on_leave = example_listener_on_leave;
+  data->num_calls++;
 }
 
 static void
-example_listener_init (ExampleListener * self)
+example_listener_on_leave (GumInvocationContext * ic,
+                           gpointer user_data)
 {
 }

package/releng/devkit-assets/frida-gum-example-windows.c

@@ -11,13 +11,11 @@
 
 #include <windows.h>
 
-typedef struct _ExampleListener ExampleListener;
+typedef struct _ExampleListenerData ExampleListenerData;
 typedef enum _ExampleHookId ExampleHookId;
 
-struct _ExampleListener
+struct _ExampleListenerData
 {
-  GObject parent;
-
   guint num_calls;
 };
 
@@ -27,52 +25,55 @@ enum _ExampleHookId
   EXAMPLE_HOOK_SLEEP
 };
 
-static void example_listener_iface_init (gpointer g_iface, gpointer iface_data);
-
-#define EXAMPLE_TYPE_LISTENER (example_listener_get_type ())
-G_DECLARE_FINAL_TYPE (ExampleListener, example_listener, EXAMPLE, LISTENER, GObject)
-G_DEFINE_TYPE_EXTENDED (ExampleListener,
-                        example_listener,
-                        G_TYPE_OBJECT,
-                        0,
-                        G_IMPLEMENT_INTERFACE (GUM_TYPE_INVOCATION_LISTENER,
-                            example_listener_iface_init))
+static void example_listener_on_enter (GumInvocationContext * ic, gpointer user_data);
+static void example_listener_on_leave (GumInvocationContext * ic, gpointer user_data);
 
 int
 main (int argc,
       char * argv[])
 {
   GumInterceptor * interceptor;
+  ExampleListenerData * data;
   GumInvocationListener * listener;
+  GumModule * user32, * kernel32;
 
   gum_init_embedded ();
 
   interceptor = gum_interceptor_obtain ();
-  listener = g_object_new (EXAMPLE_TYPE_LISTENER, NULL);
+
+  data = g_new0 (ExampleListenerData, 1);
+  listener = gum_make_call_listener (example_listener_on_enter, example_listener_on_leave, data, g_free);
+
+  user32 = gum_process_find_module_by_name ("user32.dll");
+  kernel32 = gum_process_find_module_by_name ("kernel32.dll");
 
   gum_interceptor_begin_transaction (interceptor);
   gum_interceptor_attach (interceptor,
-      GSIZE_TO_POINTER (gum_module_find_export_by_name ("user32.dll", "MessageBeep")),
+      GSIZE_TO_POINTER (gum_module_find_export_by_name (user32, "MessageBeep")),
       listener,
-      GSIZE_TO_POINTER (EXAMPLE_HOOK_MESSAGE_BEEP));
+      GSIZE_TO_POINTER (EXAMPLE_HOOK_MESSAGE_BEEP),
+      GUM_ATTACH_FLAGS_NONE);
   gum_interceptor_attach (interceptor,
-      GSIZE_TO_POINTER (gum_module_find_export_by_name ("kernel32.dll", "Sleep")),
+      GSIZE_TO_POINTER (gum_module_find_export_by_name (kernel32, "Sleep")),
       listener,
-      GSIZE_TO_POINTER (EXAMPLE_HOOK_SLEEP));
+      GSIZE_TO_POINTER (EXAMPLE_HOOK_SLEEP),
+      GUM_ATTACH_FLAGS_NONE);
   gum_interceptor_end_transaction (interceptor);
 
   MessageBeep (MB_ICONINFORMATION);
   Sleep (1);
 
-  g_print ("[*] listener got %u calls\n", EXAMPLE_LISTENER (listener)->num_calls);
+  g_print ("[*] listener got %u calls\n", data->num_calls);
 
   gum_interceptor_detach (interceptor, listener);
 
   MessageBeep (MB_ICONINFORMATION);
   Sleep (1);
 
-  g_print ("[*] listener still has %u calls\n", EXAMPLE_LISTENER (listener)->num_calls);
+  g_print ("[*] listener still has %u calls\n", data->num_calls);
 
+  g_object_unref (kernel32);
+  g_object_unref (user32);
   g_object_unref (listener);
   g_object_unref (interceptor);
 
@@ -82,11 +83,13 @@ main (int argc,
 }
 
 static void
-example_listener_on_enter (GumInvocationListener * listener,
-                           GumInvocationContext * ic)
+example_listener_on_enter (GumInvocationContext * ic,
+                           gpointer user_data)
 {
-  ExampleListener * self = EXAMPLE_LISTENER (listener);
-  ExampleHookId hook_id = GUM_IC_GET_FUNC_DATA (ic, ExampleHookId);
+  ExampleListenerData * data = user_data;
+  ExampleHookId hook_id;
+
+  hook_id = GUM_IC_GET_FUNC_DATA (ic, ExampleHookId);
 
   switch (hook_id)
   {
@@ -98,35 +101,11 @@ example_listener_on_enter (GumInvocationListener * listener,
       break;
   }
 
-  self->num_calls++;
-}
-
-static void
-example_listener_on_leave (GumInvocationListener * listener,
-                           GumInvocationContext * ic)
-{
-}
-
-static void
-example_listener_class_init (ExampleListenerClass * klass)
-{
-  (void) EXAMPLE_IS_LISTENER;
-#ifndef _MSC_VER
-  (void) glib_autoptr_cleanup_ExampleListener;
-#endif
-}
-
-static void
-example_listener_iface_init (gpointer g_iface,
-                             gpointer iface_data)
-{
-  GumInvocationListenerInterface * iface = g_iface;
-
-  iface->on_enter = example_listener_on_enter;
-  iface->on_leave = example_listener_on_leave;
+  data->num_calls++;
 }
 
 static void
-example_listener_init (ExampleListener * self)
+example_listener_on_leave (GumInvocationContext * ic,
+                           gpointer user_data)
 {
 }

package/releng/devkit.py

@@ -139,7 +139,7 @@ class CompilerApplication:
             ingest_header(selinux_header, header_files, processed_header_files, devkit_header_lines)
         devkit_header = u"".join(devkit_header_lines)
 
-        if package.startswith("frida-gumjs"):
+        if package.startswith("frida-gum"):
             config = """#ifndef GUM_STATIC
 # define GUM_STATIC
 #endif

package/releng/env.py

@@ -282,6 +282,9 @@ def can_run_host_binaries(build_machine: MachineSpec,
 
 def find_exe_wrapper(machine: MachineSpec,
                      environ: dict[str, str]) -> Optional[list[str]]:
+    if machine.arch == "arm64beilp32":
+        return None
+
     qemu_sysroot = environ.get("FRIDA_QEMU_SYSROOT")
     if qemu_sysroot is None:
         return None
@@ -417,4 +420,5 @@ QEMU_ARCHS = {
     "armhf": "arm",
     "armbe8": "armeb",
     "arm64": "aarch64",
+    "arm64be": "aarch64_be",
 }

package/releng/env_android.py

@@ -133,6 +133,7 @@ ARCH_COMMON_FLAGS = {
         "-march=armv7-a",
         "-mfloat-abi=softfp",
         "-mfpu=vfpv3-d16",
+        "-mthumb",
     ]
 }
 

package/releng/env_generic.py

@@ -293,13 +293,15 @@ ARCH_COMMON_FLAGS_UNIX = {
     ],
     "arm": [
         "-march=armv5t",
+        "-mthumb",
     ],
     "armbe8": [
-        "-march=armv6",
-        "-mbe8",
+        "-mcpu=cortex-a72",
+        "-mthumb",
     ],
     "armhf": [
         "-march=armv7-a",
+        "-mthumb",
     ],
     "arm64": [
         "-march=armv8-a",

package/releng/machine_spec.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 from dataclasses import dataclass
 import platform
 import re
+import subprocess
 from typing import Optional
 
 
@@ -14,7 +15,22 @@ class MachineSpec:
 
     @staticmethod
     def make_from_local_system() -> MachineSpec:
-        return MachineSpec(detect_os(), detect_arch())
+        os = detect_os()
+        arch = detect_arch()
+        config = None
+
+        if os == "linux":
+            try:
+                output = subprocess.run(["ldd", "--version"],
+                                        stdout=subprocess.PIPE,
+                                        stderr=subprocess.STDOUT,
+                                        encoding="utf-8").stdout
+                if "musl" in output:
+                    config = "musl"
+            except:
+                pass
+
+        return MachineSpec(os, arch, config)
 
     @staticmethod
     def parse(raw_spec: str) -> MachineSpec:
@@ -41,12 +57,18 @@ class MachineSpec:
                 if arch[0] == "i":
                     arch = "x86"
                 elif arch == "arm":
-                    if system == "gnueabihf":
+                    if system.endswith("eabihf"):
                         arch = "armhf"
                     elif os == "qnx" and system.endswith("eabi"):
                         arch = "armeabi"
+                elif arch == "armeb":
+                    arch = "armbe8"
                 elif arch == "aarch64":
                     arch = "arm64"
+                elif arch == "aarch64_be":
+                    arch = "arm64be"
+                if system.endswith("_ilp32"):
+                    arch += "ilp32"
 
                 if system.startswith("musl"):
                     config = "musl"
@@ -184,7 +206,7 @@ class MachineSpec:
         arch = self.arch
         if arch in {"x86_64", "s390x"}:
             return 8
-        if arch.startswith("arm64") or arch.startswith("mips64"):
+        if (arch.startswith("arm64") and not arch.endswith("ilp32")) or arch.startswith("mips64"):
             return 8
         return 4
 
@@ -236,29 +258,33 @@ KERNELS = {
 }
 
 CPU_FAMILIES = {
-    "armbe8":     "arm",
-    "armeabi":    "arm",
-    "armhf":      "arm",
+    "armbe8":       "arm",
+    "armeabi":      "arm",
+    "armhf":        "arm",
 
-    "arm64":      "aarch64",
-    "arm64e":     "aarch64",
-    "arm64eoabi": "aarch64",
+    "arm64":        "aarch64",
+    "arm64be":      "aarch64",
+    "arm64beilp32": "aarch64",
+    "arm64e":       "aarch64",
+    "arm64eoabi":   "aarch64",
 
-    "mipsel":     "mips",
-    "mips64el":   "mips64",
+    "mipsel":       "mips",
+    "mips64el":     "mips64",
 
-    "powerpc":    "ppc"
+    "powerpc":      "ppc"
 }
 
 CPU_TYPES = {
-    "arm":        "armv7",
-    "armbe8":     "armv6",
-    "armhf":      "armv7hf",
-    "armeabi":    "armv7eabi",
-
-    "arm64":      "aarch64",
-    "arm64e":     "aarch64",
-    "arm64eoabi": "aarch64",
+    "arm":          "armv7",
+    "armbe8":       "armv6",
+    "armhf":        "armv7hf",
+    "armeabi":      "armv7eabi",
+
+    "arm64":        "aarch64",
+    "arm64be":      "aarch64",
+    "arm64beilp32": "aarch64",
+    "arm64e":       "aarch64",
+    "arm64eoabi":   "aarch64",
 }
 
 CPU_TYPES_PER_OS_OVERRIDES = {
@@ -283,6 +309,8 @@ CPU_TYPES_PER_OS_OVERRIDES = {
 }
 
 BIG_ENDIAN_ARCHS = {
+    "arm64be",
+    "arm64beilp32",
     "armbe8",
     "mips",
     "mips64",
@@ -291,4 +319,4 @@ BIG_ENDIAN_ARCHS = {
     "s390x",
 }
 
-TARGET_TRIPLET_ARCH_PATTERN = re.compile(r"^(i.86|x86_64|arm\w*|aarch64|mips\w*|powerpc|s390x)$")
+TARGET_TRIPLET_ARCH_PATTERN = re.compile(r"^(i.86|x86_64|arm\w*|aarch64(_be)?|mips\w*|powerpc|s390x)$")

package/scripts/fetch-abi-bits.py

@@ -49,7 +49,7 @@ def main(argv: list[str]):
                        cwd=abidir,
                        check=True)
 
-        abi = subprocess.run([node, "-e", f"console.log(require('node-abi').getAbi('{target}', '{runtime}'))"],
+        abi = subprocess.run([node, "-e", f"import('node-abi').then(abi => {{ console.log(abi.getAbi('{target}', '{runtime}')); }})"],
                              capture_output=True,
                              encoding="utf-8",
                              cwd=abidir,

package/subprojects/frida-core.wrap

@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://github.com/frida/frida-core.git
-revision = 16.6.6
+revision = 16.7.2
 depth = 1
 
 [provide]