deps,test: update postject to 1.0.0-alpha.5

PR-URL: #46934 Fixes: nodejs/postject#76 Reviewed-By: Darshan Sen <[email protected]> Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
nodejs · Apr 11, 2023 · f8d4bf8 · f8d4bf8
1 parent b8cdd15
commit f8d4bf8
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 23 deletions.
diff --git a/deps/postject/postject-api.h b/deps/postject/postject-api.h
@@ -12,7 +12,6 @@
 #elif defined(__linux__)
 #include <elf.h>
 #include <link.h>
-#include <sys/auxv.h>
 #include <sys/param.h>
 #elif defined(_WIN32)
 #include <windows.h>
@@ -44,6 +43,16 @@ static inline bool postject_has_resource() {
   return sentinel[sizeof(POSTJECT_SENTINEL_FUSE)] == '1';
 }
 
+#if defined(__linux__)
+static int postject__dl_iterate_phdr_callback(struct dl_phdr_info* info,
+                                              size_t size,
+                                              void* data) {
+  // Snag the dl_phdr_info struct for the main program, then stop iterating
+  *((struct dl_phdr_info*)data) = *info;
+  return 1;
+}
+#endif
+
 static const void* postject_find_resource(
     const char* name,
     size_t* size,
@@ -114,9 +123,12 @@ static const void* postject_find_resource(
     name = options->elf_section_name;
   }
 
-  uintptr_t p = getauxval(AT_PHDR);
-  size_t n = getauxval(AT_PHNUM);
-  uintptr_t base_addr = p - sizeof(ElfW(Ehdr));
+  struct dl_phdr_info main_program_info;
+  dl_iterate_phdr(postject__dl_iterate_phdr_callback, &main_program_info);
+
+  uintptr_t p = (uintptr_t)main_program_info.dlpi_phdr;
+  size_t n = main_program_info.dlpi_phnum;
+  uintptr_t base_addr = main_program_info.dlpi_addr;
 
   // iterate program header
   for (; n > 0; n--, p += sizeof(ElfW(Phdr))) {

diff --git a/test/fixtures/postject-copy/node_modules/.package-lock.json b/test/fixtures/postject-copy/node_modules/.package-lock.json
diff --git a/test/fixtures/postject-copy/node_modules/postject/dist/api.js b/test/fixtures/postject-copy/node_modules/postject/dist/api.js
diff --git a/test/fixtures/postject-copy/node_modules/postject/dist/cli.js b/test/fixtures/postject-copy/node_modules/postject/dist/cli.js
diff --git a/test/fixtures/postject-copy/node_modules/postject/dist/postject-api.h b/test/fixtures/postject-copy/node_modules/postject/dist/postject-api.h
diff --git a/test/fixtures/postject-copy/node_modules/postject/package.json b/test/fixtures/postject-copy/node_modules/postject/package.json
diff --git a/test/fixtures/postject-copy/package-lock.json b/test/fixtures/postject-copy/package-lock.json
diff --git a/test/fixtures/postject-copy/package.json b/test/fixtures/postject-copy/package.json
@@ -10,6 +10,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "postject": "^1.0.0-alpha.4"
+    "postject": "^1.0.0-alpha.5"
   }
 }