Fallback on /proc/<pid>/exe if /proc/<pid>/root/<path> is inacces…

…sible
adsr · May 12, 2020 · f14b2d6 · f14b2d6
1 parent 4ce41f4
commit f14b2d6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/addr_objdump.c b/addr_objdump.c
@@ -32,6 +32,9 @@ static int get_php_bin_path(pid_t pid, char *path_root, char *path) {
         return 1;
     }
     snprintf(path_root, PHPSPY_STR_SIZE, "/proc/%d/root/%s", (int)pid, buf);
+    if (access(path_root, F_OK) != 0) {
+        snprintf(path_root, PHPSPY_STR_SIZE, "/proc/%d/exe", (int)pid);
+    }
     strcpy(path, buf);
     return 0;
 }

diff --git a/phpspy.c b/phpspy.c
@@ -730,9 +730,10 @@ static void try_get_php_version(trace_target_t *target) {
             "{ echo -n /proc/%d/root/; "
             "  awk '/libphp[78]/{print $NF; exit 0} END{exit 1}' /proc/%d/maps "
             "  || readlink /proc/%d/exe; } "
+            "| { xargs stat --printf=%%n 2>/dev/null || echo /proc/%d/exe; } "
             "| xargs strings "
             "| grep -Po '(?<=X-Powered-By: PHP/)\\d\\.\\d'",
-            pid, pid, pid
+            pid, pid, pid, pid
         );
         if ((pcmd = popen(version_cmd, "r")) == NULL) {
             perror("try_get_php_version: popen");