Title: [273120] trunk/Source/WebKit
Revision
273120
Author
pvol...@apple.com
Date
2021-02-18 18:53:47 -0800 (Thu, 18 Feb 2021)

Log Message

[iOS] Remove access to AppleJPEGDriverUserClient
https://bugs.webkit.org/show_bug.cgi?id=221458
<rdar://problem/73518481>

Reviewed by Brent Fulgham.

Remove access to AppleJPEGDriverUserClient in the WebContent process' sandbox on iOS.

* Resources/SandboxProfiles/ios/com.apple.WebKit.GPU.sb:
* Resources/SandboxProfiles/ios/com.apple.WebKit.WebAuthn.sb:
* Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb:
* UIProcess/WebPageProxy.cpp:
(WebKit::gpuIOKitClasses):

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (273119 => 273120)


--- trunk/Source/WebKit/ChangeLog	2021-02-19 02:16:26 UTC (rev 273119)
+++ trunk/Source/WebKit/ChangeLog	2021-02-19 02:53:47 UTC (rev 273120)
@@ -1,3 +1,19 @@
+2021-02-18  Per Arne Vollan  <pvol...@apple.com>
+
+        [iOS] Remove access to AppleJPEGDriverUserClient
+        https://bugs.webkit.org/show_bug.cgi?id=221458
+        <rdar://problem/73518481>
+
+        Reviewed by Brent Fulgham.
+
+        Remove access to AppleJPEGDriverUserClient in the WebContent process' sandbox on iOS.
+
+        * Resources/SandboxProfiles/ios/com.apple.WebKit.GPU.sb:
+        * Resources/SandboxProfiles/ios/com.apple.WebKit.WebAuthn.sb:
+        * Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::gpuIOKitClasses):
+
 2021-02-18  Megan Gardner  <megan_gard...@apple.com>
 
         Correctly retain properties in _WKAppHighlight

Modified: trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.GPU.sb (273119 => 273120)


--- trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.GPU.sb	2021-02-19 02:16:26 UTC (rev 273119)
+++ trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.GPU.sb	2021-02-19 02:53:47 UTC (rev 273120)
@@ -405,7 +405,6 @@
 
     ; UIKit-required IOKit nodes.
     (allow iokit-open
-        (iokit-user-client-class "AppleJPEGDriverUserClient")
         (iokit-user-client-class "IOSurfaceAcceleratorClient")
         (iokit-user-client-class "IOSurfaceSendRight")
         ;; Requires by UIView -> UITextMagnifierRenderer -> UIWindow

Modified: trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebAuthn.sb (273119 => 273120)


--- trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebAuthn.sb	2021-02-19 02:16:26 UTC (rev 273119)
+++ trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebAuthn.sb	2021-02-19 02:53:47 UTC (rev 273120)
@@ -198,7 +198,6 @@
 
     ; UIKit-required IOKit nodes.
     (allow iokit-open
-        (iokit-user-client-class "AppleJPEGDriverUserClient")
         (iokit-user-client-class "IOSurfaceAcceleratorClient")
         (iokit-user-client-class "IOSurfaceSendRight")
         ;; Requires by UIView -> UITextMagnifierRenderer -> UIWindow

Modified: trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb (273119 => 273120)


--- trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb	2021-02-19 02:16:26 UTC (rev 273119)
+++ trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb	2021-02-19 02:53:47 UTC (rev 273120)
@@ -404,22 +404,6 @@
         (iokit-user-client-class "IOSurfaceSendRight")
     )
 
-    (allow iokit-open
-        (require-all
-            (extension "com.apple.webkit.extension.iokit")
-            (iokit-user-client-class "AppleJPEGDriverUserClient")
-        )
-        (when (defined? 'iokit-external-method)
-            (apply-message-filter
-                (deny (with telemetry)
-                    iokit-async-external-method
-                    iokit-external-trap)
-                (allow
-                    iokit-external-method)
-            )
-        )
-    )
-
     ; WebKit-required IOKit classes
     (allow iokit-open
         (require-all
@@ -1007,7 +991,6 @@
     (require-all
         (require-not (extension "com.apple.webkit.extension.iokit"))
         (iokit-user-client-class
-            "AppleJPEGDriverUserClient"
             "IOSurfaceAcceleratorClient"
             "IOSurfaceRootUserClient"
         )
@@ -1014,6 +997,12 @@
     )
 )
 
+(deny iokit-open (with no-log)
+    (iokit-user-client-class
+        "AppleJPEGDriverUserClient"
+    )
+)
+
 (allow iokit-open (with report) (with telemetry-backtrace)
     (require-all
         (require-not (extension "com.apple.webkit.extension.iokit"))

Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (273119 => 273120)


--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp	2021-02-19 02:16:26 UTC (rev 273119)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp	2021-02-19 02:53:47 UTC (rev 273120)
@@ -7663,7 +7663,6 @@
     static const auto services = makeNeverDestroyed(Vector<ASCIILiteral> {
 #if PLATFORM(IOS_FAMILY)
         "AGXDeviceUserClient"_s,
-        "AppleJPEGDriverUserClient"_s,
         "IOGPU"_s,
         "IOSurfaceRootUserClient"_s,
 #endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to