Title: [278386] branches/safari-612.1.16-branch/Source/WebKit
- Revision
- 278386
- Author
- rubent...@apple.com
- Date
- 2021-06-02 16:51:18 -0700 (Wed, 02 Jun 2021)
Log Message
Cherry-pick r278370. rdar://problem/78787261
[iOS] Fix IOKit sandbox violations
https://bugs.webkit.org/show_bug.cgi?id=226546
<rdar://78523469>
Reviewed by Tim Horton.
Fix IOKit sandbox violations in the WebContent process on iOS.
* Configurations/SandboxProfiles.xcconfig:
* Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb.in:
* WebKit.xcodeproj/project.pbxproj:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@278370 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612.1.16-branch/Source/WebKit/ChangeLog (278385 => 278386)
--- branches/safari-612.1.16-branch/Source/WebKit/ChangeLog 2021-06-02 23:51:16 UTC (rev 278385)
+++ branches/safari-612.1.16-branch/Source/WebKit/ChangeLog 2021-06-02 23:51:18 UTC (rev 278386)
@@ -1,5 +1,38 @@
2021-06-02 Russell Epstein <repst...@apple.com>
+ Cherry-pick r278370. rdar://problem/78787261
+
+ [iOS] Fix IOKit sandbox violations
+ https://bugs.webkit.org/show_bug.cgi?id=226546
+ <rdar://78523469>
+
+ Reviewed by Tim Horton.
+
+ Fix IOKit sandbox violations in the WebContent process on iOS.
+
+ * Configurations/SandboxProfiles.xcconfig:
+ * Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb.in:
+ * WebKit.xcodeproj/project.pbxproj:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@278370 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-06-02 Per Arne <pvol...@apple.com>
+
+ [iOS] Fix IOKit sandbox violations
+ https://bugs.webkit.org/show_bug.cgi?id=226546
+ <rdar://78523469>
+
+ Reviewed by Tim Horton.
+
+ Fix IOKit sandbox violations in the WebContent process on iOS.
+
+ * Configurations/SandboxProfiles.xcconfig:
+ * Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb.in:
+ * WebKit.xcodeproj/project.pbxproj:
+
+2021-06-02 Russell Epstein <repst...@apple.com>
+
Cherry-pick r278308. rdar://problem/78789128
[iOS] Preprocess the WebContent sandbox
Modified: branches/safari-612.1.16-branch/Source/WebKit/Configurations/SandboxProfiles.xcconfig (278385 => 278386)
--- branches/safari-612.1.16-branch/Source/WebKit/Configurations/SandboxProfiles.xcconfig 2021-06-02 23:51:16 UTC (rev 278385)
+++ branches/safari-612.1.16-branch/Source/WebKit/Configurations/SandboxProfiles.xcconfig 2021-06-02 23:51:18 UTC (rev 278386)
@@ -3,4 +3,5 @@
INSTALL_PATH_WK_INSTALL_OVERRIDE_SANDBOX_PROFILES_NO = /usr/local/share/sandbox/profiles/embedded/builtin;
INSTALL_PATH_WK_INSTALL_OVERRIDE_SANDBOX_PROFILES_YES = /usr/local/share/sandbox;
+INSTALLHDRS_SCRIPT_PHASE = YES;
INSTALLHDRS_COPY_PHASE = YES;
Modified: branches/safari-612.1.16-branch/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb.in (278385 => 278386)
--- branches/safari-612.1.16-branch/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb.in 2021-06-02 23:51:16 UTC (rev 278385)
+++ branches/safari-612.1.16-branch/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb.in 2021-06-02 23:51:18 UTC (rev 278386)
@@ -264,11 +264,14 @@
iokit-external-method
)
(allow iokit-async-external-method
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 150500
(iokit-method-number
43
)
+#endif
)
(allow iokit-external-method
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 150500
(iokit-method-number
0
2
@@ -295,6 +298,7 @@
42
44
)
+#endif
)
)
Modified: branches/safari-612.1.16-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj (278385 => 278386)
--- branches/safari-612.1.16-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2021-06-02 23:51:16 UTC (rev 278385)
+++ branches/safari-612.1.16-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2021-06-02 23:51:18 UTC (rev 278386)
@@ -14028,7 +14028,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "Scripts/generate-derived-sources.sh sandbox-profiles-ios\ncp ${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit2/com.apple.WebKit.WebContent.sb ${DSTROOT}/${INSTALL_PATH}\n";
+ shellScript = "echo \"Preprocessing sandbox\"\nScripts/generate-derived-sources.sh sandbox-profiles-ios\ncp ${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit2/com.apple.WebKit.WebContent.sb ${DSTROOT}/${INSTALL_PATH}\n";
};
F4EFBAD522540CBB00049BA6 /* Replace WebKitAdditions in Framework Headers */ = {
isa = PBXShellScriptBuildPhase;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
