Fixes to loader and bootstrapper

frida · Jan 15, 2025 · 38af3cb · 38af3cb
1 parent bb4a906
commit 38af3cb
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 17 deletions.
diff --git a/src/linux/helpers/bootstrapper-armbe8.bin b/src/linux/helpers/bootstrapper-armbe8.bin
diff --git a/src/linux/helpers/loader-arm.bin b/src/linux/helpers/loader-arm.bin
diff --git a/src/linux/helpers/loader-arm64.bin b/src/linux/helpers/loader-arm64.bin
diff --git a/src/linux/helpers/loader-armbe8.bin b/src/linux/helpers/loader-armbe8.bin
diff --git a/src/linux/helpers/loader-mips.bin b/src/linux/helpers/loader-mips.bin
diff --git a/src/linux/helpers/loader-mips64.bin b/src/linux/helpers/loader-mips64.bin
diff --git a/src/linux/helpers/loader-mips64el.bin b/src/linux/helpers/loader-mips64el.bin
diff --git a/src/linux/helpers/loader-mipsel.bin b/src/linux/helpers/loader-mipsel.bin
diff --git a/src/linux/helpers/loader-x86.bin b/src/linux/helpers/loader-x86.bin
diff --git a/src/linux/helpers/loader-x86_64.bin b/src/linux/helpers/loader-x86_64.bin
diff --git a/src/linux/helpers/loader.c b/src/linux/helpers/loader.c
@@ -303,16 +303,20 @@ frida_receive_chunk (int sockfd, void * buffer, size_t length, const FridaLibcAp
       .iov_base = cursor,
       .iov_len = remaining
     };
-    struct msghdr msg = {
-      .msg_name = NULL,
-      .msg_namelen = 0,
-      .msg_iov = &io,
-      .msg_iovlen = 1,
-      .msg_control = NULL,
-      .msg_controllen = 0,
-    };
+    struct msghdr msg;
     ssize_t n;
 
+    /*
+     * Avoid inline initialization to prevent the compiler attempting to insert
+     * a call to memset.
+     */
+    msg.msg_name = NULL,
+    msg.msg_namelen = 0,
+    msg.msg_iov = &io,
+    msg.msg_iovlen = 1,
+    msg.msg_control = NULL,
+    msg.msg_controllen = 0,
+
     n = libc->recvmsg (sockfd, &msg, 0);
     if (n <= 0)
       return false;
@@ -334,14 +338,18 @@ frida_receive_fd (int sockfd, const FridaLibcApi * libc)
     .iov_len = sizeof (dummy)
   };
   FridaControlMessage control;
-  struct msghdr msg = {
-    .msg_name = NULL,
-    .msg_namelen = 0,
-    .msg_iov = &io,
-    .msg_iovlen = 1,
-    .msg_control = &control,
-    .msg_controllen = sizeof (control),
-  };
+  struct msghdr msg;
+
+  /*
+   * Avoid inline initialization to prevent the compiler attempting to insert
+   * a call to memset.
+   */
+  msg.msg_name = NULL,
+  msg.msg_namelen = 0,
+  msg.msg_iov = &io,
+  msg.msg_iovlen = 1,
+  msg.msg_control = &control,
+  msg.msg_controllen = sizeof (control),
 
   res = libc->recvmsg (sockfd, &msg, 0);
   if (res == -1 || res == 0 || msg.msg_controllen == 0)

diff --git a/src/linux/helpers/nolibc-tweaks.patch b/src/linux/helpers/nolibc-tweaks.patch
@@ -197,7 +197,7 @@ diff --git a/tools/include/nolibc/std.h b/tools/include/nolibc/std.h
 index 1747ae125..5f30e6e0c 100644
 --- a/tools/include/nolibc/std.h
 +++ b/tools/include/nolibc/std.h
-@@ -25,25 +25,53 @@ typedef unsigned short     uint16_t;
+@@ -25,25 +25,61 @@ typedef unsigned short     uint16_t;
  typedef   signed short      int16_t;
  typedef unsigned int       uint32_t;
  typedef   signed int        int32_t;
@@ -211,6 +211,14 @@ index 1747ae125..5f30e6e0c 100644
  typedef unsigned long     uintptr_t;
  typedef   signed long      intptr_t;
  typedef   signed long     ptrdiff_t;
++#elif defined(__arm__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
++typedef unsigned long long uint64_t;
++typedef   signed long long  int64_t;
++typedef unsigned int         size_t;
++typedef   signed int        ssize_t;
++typedef unsigned long     uintptr_t;
++typedef   signed int       intptr_t;
++typedef   signed int      ptrdiff_t;
 +#else
 +typedef unsigned long long uint64_t;
 +typedef   signed long long  int64_t;

diff --git a/src/meson.build b/src/meson.build
@@ -319,6 +319,9 @@ if have_local_backend
     else
       host_lowlevel_abi = host_abi
     endif
+    if host_lowlevel_abi == 'arm' and host_machine.endian() == 'big'
+      host_lowlevel_abi = 'armbe8'
+    endif
     fs = import('fs')
     helper_backend_data = custom_target('frida-data-helper-backend',
       input: [