Remove use of dyld_register_image_state_change_handler() in PluginProcessMac.mm
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 17 Mar 2016 21:01:21 +0000 (21:01 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 17 Mar 2016 21:01:21 +0000 (21:01 +0000)
https://bugs.webkit.org/show_bug.cgi?id=155596

Reviewed by Dan Bernstein.

Use _dyld_register_func_for_add_image instead which is API. Use dladdr to find the image path given its header.

* Platform/spi/Cocoa/DyldSPI.h: Removed.
* PluginProcess/mac/PluginProcessMac.mm:
(WebKit::PluginProcess::platformInitializeProcess):
* WebKit2.xcodeproj/project.pbxproj:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@198352 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/Platform/spi/Cocoa/DyldSPI.h [deleted file]
Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm
Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

index 7e22f75..51e7083 100644 (file)
@@ -1,3 +1,17 @@
+2016-03-17  Anders Carlsson  <andersca@apple.com>
+
+        Remove use of dyld_register_image_state_change_handler() in PluginProcessMac.mm
+        https://bugs.webkit.org/show_bug.cgi?id=155596
+
+        Reviewed by Dan Bernstein.
+
+        Use _dyld_register_func_for_add_image instead which is API. Use dladdr to find the image path given its header.
+
+        * Platform/spi/Cocoa/DyldSPI.h: Removed.
+        * PluginProcess/mac/PluginProcessMac.mm:
+        (WebKit::PluginProcess::platformInitializeProcess):
+        * WebKit2.xcodeproj/project.pbxproj:
+
 2016-03-17  Chris Dumez  <cdumez@apple.com>
 
         Set the WebContent process's main thread QoS to USER-INTERACTIVE
diff --git a/Source/WebKit2/Platform/spi/Cocoa/DyldSPI.h b/Source/WebKit2/Platform/spi/Cocoa/DyldSPI.h
deleted file mode 100644 (file)
index 5aac82d..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#if USE(APPLE_INTERNAL_SDK)
-
-#import <mach-o/dyld_priv.h>
-
-#else
-
-#import <mach-o/dyld_images.h>
-#import <stdint.h>
-
-enum dyld_image_states {
-    dyld_image_state_bound = 40,
-};
-
-typedef const char* (*dyld_image_state_change_handler)(enum dyld_image_states state, uint32_t infoCount, const struct dyld_image_info info[]);
-
-extern "C" void dyld_register_image_state_change_handler(enum dyld_image_states state, bool batch, dyld_image_state_change_handler handler);
-
-#endif
index c93c546..0ffa8b1 100644 (file)
@@ -30,7 +30,6 @@
 #if ENABLE(NETSCAPE_PLUGIN_API)
 
 #import "ArgumentCoders.h"
-#import "DyldSPI.h"
 #import "NetscapePlugin.h"
 #import "PluginProcessCreationParameters.h"
 #import "PluginProcessProxyMessages.h"
@@ -42,6 +41,7 @@
 #import <WebCore/LocalizedStrings.h>
 #import <WebKitSystemInterface.h>
 #import <dlfcn.h>
+#import <mach-o/dyld.h>
 #import <mach-o/getsect.h>
 #import <mach/mach_vm.h>
 #import <mach/vm_statistics.h>
@@ -490,38 +490,38 @@ void PluginProcess::platformInitializeProcess(const ChildProcessInitializationPa
         // Silverlight expects the data segment of its coreclr library to be executable.
         // Register with dyld to get notified when libraries are bound, then look for the
         // coreclr image and make its __DATA segment executable.
-        dyld_register_image_state_change_handler(dyld_image_state_bound, false, [](enum dyld_image_states state, uint32_t infoCount, const struct dyld_image_info info[]) -> const char* {
-            for (uint32_t i = 0; i < infoCount; ++i) {
-                const char* pathSuffix = "/Silverlight.plugin/Contents/MacOS/CoreCLR.bundle/Contents/MacOS/coreclr";
-
-                int pathSuffixLength = strlen(pathSuffix);
-                int imageFilePathLength = strlen(info[i].imageFilePath);
-
-                if (imageFilePathLength < pathSuffixLength)
-                    continue;
-
-                if (strcmp(info[i].imageFilePath + (imageFilePathLength - pathSuffixLength), pathSuffix))
-                    continue;
-
-                unsigned long segmentSize;
-                const uint8_t* segmentData = getsegmentdata(info[i].imageLoadAddress, "__DATA", &segmentSize);
-                if (!segmentData)
+        _dyld_register_func_for_add_image([](const struct mach_header* mh, intptr_t vmaddr_slide) {
+            Dl_info imageInfo;
+            if (!dladdr(mh, &imageInfo))
+                return;
+
+            const char* pathSuffix = "/Silverlight.plugin/Contents/MacOS/CoreCLR.bundle/Contents/MacOS/coreclr";
+
+            int pathSuffixLength = strlen(pathSuffix);
+            int imageFilePathLength = strlen(imageInfo.dli_fname);
+
+            if (imageFilePathLength < pathSuffixLength)
+                return;
+
+            if (strcmp(imageInfo.dli_fname + (imageFilePathLength - pathSuffixLength), pathSuffix))
+                return;
+
+            unsigned long segmentSize;
+            const uint8_t* segmentData = getsegmentdata(mh, "__DATA", &segmentSize);
+            if (!segmentData)
+                return;
+
+            mach_vm_size_t size;
+            uint32_t depth = 0;
+            struct vm_region_submap_info_64 info = { };
+            mach_msg_type_number_t count = VM_REGION_SUBMAP_INFO_COUNT_64;
+            for (mach_vm_address_t addr = reinterpret_cast<mach_vm_address_t>(segmentData); addr < reinterpret_cast<mach_vm_address_t>(segmentData) + segmentSize ; addr += size) {
+                kern_return_t kr = mach_vm_region_recurse(mach_task_self(), &addr, &size, &depth, (vm_region_recurse_info_64_t)&info, &count);
+                if (kr != KERN_SUCCESS)
                     break;
 
-                mach_vm_size_t size;
-                uint32_t depth = 0;
-                struct vm_region_submap_info_64 info = { };
-                mach_msg_type_number_t count = VM_REGION_SUBMAP_INFO_COUNT_64;
-                for (mach_vm_address_t addr = reinterpret_cast<mach_vm_address_t>(segmentData); addr < reinterpret_cast<mach_vm_address_t>(segmentData) + segmentSize ; addr += size) {
-                    kern_return_t kr = mach_vm_region_recurse(mach_task_self(), &addr, &size, &depth, (vm_region_recurse_info_64_t)&info, &count);
-                    if (kr != KERN_SUCCESS)
-                        break;
-
-                    mach_vm_protect(mach_task_self(), addr, size, false, info.protection | VM_PROT_EXECUTE);
-                }
+                mach_vm_protect(mach_task_self(), addr, size, false, info.protection | VM_PROT_EXECUTE);
             }
-
-            return nullptr;
         });
     }
 #endif
index 1e86cc3..4e91d70 100644 (file)
                1A2D92211281DC1B001EB962 /* PluginProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A2D92201281DC1B001EB962 /* PluginProxyMac.mm */; };
                1A2D956F12848564001EB962 /* ChildProcess.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A2D956D12848564001EB962 /* ChildProcess.h */; };
                1A2D957012848564001EB962 /* ChildProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2D956E12848564001EB962 /* ChildProcess.cpp */; };
-               1A2E17EF1C6A590C00D04CF6 /* DyldSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A2E17EE1C6A590C00D04CF6 /* DyldSPI.h */; };
                1A30066E1110F4F70031937C /* ResponsivenessTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A30066C1110F4F70031937C /* ResponsivenessTimer.h */; };
                1A30EAC6115D7DA30053E937 /* ConnectionMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A30EAC5115D7DA30053E937 /* ConnectionMac.mm */; };
                1A334DED16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A334DEB16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp */; };
                1A2D92201281DC1B001EB962 /* PluginProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PluginProxyMac.mm; sourceTree = "<group>"; };
                1A2D956D12848564001EB962 /* ChildProcess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChildProcess.h; sourceTree = "<group>"; };
                1A2D956E12848564001EB962 /* ChildProcess.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ChildProcess.cpp; sourceTree = "<group>"; };
-               1A2E17EE1C6A590C00D04CF6 /* DyldSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DyldSPI.h; sourceTree = "<group>"; };
                1A30066C1110F4F70031937C /* ResponsivenessTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResponsivenessTimer.h; sourceTree = "<group>"; };
                1A30EAC5115D7DA30053E937 /* ConnectionMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ConnectionMac.mm; sourceTree = "<group>"; };
                1A334DEA16DE8B68006A8E38 /* StorageAreaMap.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = StorageAreaMap.messages.in; sourceTree = "<group>"; };
                        isa = PBXGroup;
                        children = (
                                1A5705101BE410E500874AF1 /* BlockSPI.h */,
-                               1A2E17EE1C6A590C00D04CF6 /* DyldSPI.h */,
                                3754D5441B3A29FD003A4C7F /* NSInvocationSPI.h */,
                        );
                        path = Cocoa;
                                51F060E01654317F00F3281B /* WebResourceLoaderMessages.h in Headers */,
                                7C361D731927FA360036A59D /* WebScriptMessageHandler.h in Headers */,
                                D3B9484911FF4B6500032B39 /* WebSearchPopupMenu.h in Headers */,
-                               1A2E17EF1C6A590C00D04CF6 /* DyldSPI.h in Headers */,
                                1A4832D71A9CDF96008B4DFE /* WebsiteData.h in Headers */,
                                1A4832D11A9BDC2F008B4DFE /* WebsiteDataRecord.h in Headers */,
                                1A53C2AA1A325730004E8C70 /* WebsiteDataStore.h in Headers */,