Changeset 23032

Timestamp:

02/06/07 11:16:25 (22 months ago)

Author:

zarzycki@…

Message:

I just got off the phone with our dynamic linker engineer. This should work just as well, but with less code.

Files:

• trunk/launchd/src/launchd_runtime.c (modified) (5 diffs)

trunk/launchd/src/launchd_runtime.c

@@ -35 +35 @@
 #include <mach/mach_host.h>
 #include <mach/exception.h>
-#include <mach-o/dyld.h>
 #include <sys/types.h>
 #include <sys/time.h>
@@ -52 +51 @@
 #include <stdbool.h>
 #include <syslog.h>
+#include <dlfcn.h>
 
 #include "launchd_internalServer.h"
@@ -193 +193 @@
 }
 
-static bool
-ptr_is_in_exe(void *ptr)
-{
-        uint32_t i, count = _dyld_image_count();
-
-        for (i = 0; i < count; i++) {
-                const struct mach_header *header = _dyld_get_image_header(i);
-                uint32_t j, offset = _dyld_get_image_vmaddr_slide(i);
-                struct segment_command *seg;
-                struct load_command *cmd;
-
-                j = 0;
-                cmd = (struct load_command*)((char *)header + sizeof(struct mach_header));
-
-                while (j < header->ncmds) {
-                        if (cmd->cmd == LC_SEGMENT) {
-                                seg = (struct segment_command*)cmd;
-                                if (((uint32_t)ptr >= (seg->vmaddr + offset)) && ((uint32_t)ptr < (seg->vmaddr + offset + seg->vmsize))) {
-                                        return true;
-                                }
-                        }
-
-                        j++;
-                        cmd = (struct load_command*)((char*)cmd + cmd->cmdsize);
-                }
-        }
-        
-        return false;
-}
-
 kern_return_t
 x_handle_kqueue(mach_port_t junk __attribute__((unused)), integer_t fd)
@@ -228 +198 @@
         struct timespec ts = { 0, 0 };
         struct kevent kev;
+        Dl_info dli;
         int kevr;
 
@@ -233 +204 @@
 
         if (kevr == 1) {
-                if (launchd_assumes(malloc_size(kev.udata) || ptr_is_in_exe(kev.udata))) {
+                if (launchd_assumes(malloc_size(kev.udata) || dladdr(kev.udata, &dli))) {
                         (*((kq_callback *)kev.udata))(kev.udata, &kev);
                 } else {