Title: [275406] trunk/Source/WebKit
Revision
275406
Author
[email protected]
Date
2021-04-01 23:12:48 -0700 (Thu, 01 Apr 2021)

Log Message

Unreviewed, reverting r275387.
https://bugs.webkit.org/show_bug.cgi?id=224094

IOKit method list not complete

Reverted changeset:

"Add IOKit method filter telemetry"
https://bugs.webkit.org/show_bug.cgi?id=223652
https://trac.webkit.org/changeset/275387

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (275405 => 275406)


--- trunk/Source/WebKit/ChangeLog	2021-04-02 05:10:36 UTC (rev 275405)
+++ trunk/Source/WebKit/ChangeLog	2021-04-02 06:12:48 UTC (rev 275406)
@@ -1,3 +1,16 @@
+2021-04-01  Commit Queue  <[email protected]>
+
+        Unreviewed, reverting r275387.
+        https://bugs.webkit.org/show_bug.cgi?id=224094
+
+        IOKit method list not complete
+
+        Reverted changeset:
+
+        "Add IOKit method filter telemetry"
+        https://bugs.webkit.org/show_bug.cgi?id=223652
+        https://trac.webkit.org/changeset/275387
+
 2021-04-01  Said Abou-Hallawa  <[email protected]>
 
         Add a macro to help staging logDiagnosticMessageWithDomain in Safari

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


--- trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb	2021-04-02 05:10:36 UTC (rev 275405)
+++ trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb	2021-04-02 06:12:48 UTC (rev 275406)
@@ -96,7 +96,7 @@
                 (deny (with telemetry)
                     iokit-async-external-method
                     iokit-external-trap)
-                (allow (with telemetry) (with message "IOMobileFramebufferUserClient")
+                (allow
                     iokit-external-method)
             )
         )
@@ -238,18 +238,6 @@
             (extension "com.apple.webkit.extension.iokit")
             (iokit-connection "IOGPU")
         )
-        (when (defined? 'iokit-external-method)
-            (apply-message-filter
-                (deny (with telemetry)
-                    iokit-external-trap)
-                (allow (with telemetry) (with message "IOGPU")
-                    iokit-async-external-method
-                    iokit-external-method)
-            )
-        )
-    )
-
-    (allow iokit-open
         (require-all
             (extension "com.apple.webkit.extension.iokit")
             (iokit-user-client-class "AGXDeviceUserClient") ;; Used by WebGL
@@ -258,41 +246,9 @@
             (apply-message-filter
                 (deny (with telemetry)
                     iokit-external-trap)
-                (allow (with telemetry) (with message "AGXDeviceUserClient")
+                (allow
                     iokit-async-external-method
-                    iokit-external-method
-                )
-                (allow iokit-async-external-method
-                    (iokit-method-number
-                        43
-                    )
-                )
-                (allow iokit-external-method
-                    (iokit-method-number
-                        0
-                        2
-                        4
-                        5
-                        6
-                        7
-                        8
-                        9
-                        10
-                        11
-                        12
-                        13
-                        14
-                        15
-                        16
-                        25
-                        26
-                        27
-                        36
-                        38
-                        44
-                    )
-                )
-
+                    iokit-external-method)
             )
         )
     )
@@ -460,13 +416,8 @@
                 (deny (with telemetry)
                     iokit-async-external-method
                     iokit-external-trap)
-                (allow (with telemetry) (with message "IOSurfaceAcceleratorClient")
+                (allow
                     iokit-external-method)
-                (allow iokit-external-method
-                    (iokit-method-number
-                        1
-                    )
-                )
             )
         )
     )
@@ -481,31 +432,8 @@
                 (deny (with telemetry)
                     iokit-async-external-method
                     iokit-external-trap)
-                (allow (with telemetry) (with message "IOSurfaceRootUserClient")
+                (allow
                     iokit-external-method)
-                (allow iokit-external-method
-                    (iokit-method-number
-                        0
-                        1
-                        2
-                        3
-                        5
-                        9
-                        10
-                        11
-                        13
-                        14
-                        15
-                        20
-                        21
-                        23
-                        27
-                        31
-                        32
-                        34
-                        35
-                    )
-                )
             )
         )
     )
@@ -1098,7 +1026,7 @@
             (deny (with telemetry)
                 iokit-async-external-method
                 iokit-external-trap)
-            (allow (with telemetry) (with message "IOSurfaceRootUserClient no extension")
+            (allow
                 iokit-external-method)
         )
     )

Modified: trunk/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in (275405 => 275406)


--- trunk/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in	2021-04-02 05:10:36 UTC (rev 275405)
+++ trunk/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in	2021-04-02 06:12:48 UTC (rev 275406)
@@ -144,40 +144,10 @@
             )
             (with telemetry-backtrace)
             (apply-message-filter
-                (allow (with telemetry) (with message "IOAccelerator")
+                (allow
                     iokit-async-external-method
                     iokit-external-method
                 )
-                (allow iokit-async-external-method
-                    (iokit-method-number
-                        47
-                    )
-                )
-                (allow iokit-external-method
-                    (iokit-method-number
-                        0
-                        2
-                        5
-                        6
-                        7
-                        8
-                        9
-                        10
-                        11
-                        12
-                        13
-                        15
-                        16
-                        17
-                        18
-                        29
-                        30
-                        31
-                        40
-                        42
-                        48
-                    )
-                )
                 (deny (with telemetry)
                     iokit-external-trap
                 )
@@ -222,38 +192,10 @@
             )
             (with telemetry-backtrace)
             (apply-message-filter
-                (allow (with telemetry) (with message "IOSurfaceRootUserClient")
+                (allow
                     iokit-async-external-method
                     iokit-external-method
                 )
-                (allow iokit-async-external-method
-                    (iokit-method-number
-                        17
-                    )
-                )
-                (allow iokit-external-method
-                    (iokit-method-number
-                        0
-                        1
-                        2
-                        3
-                        9
-                        10
-                        11
-                        12
-                        13
-                        14
-                        15
-                        20
-                        23
-                        27
-                        31
-                        32
-                        34
-                        35
-                        44
-                    )
-                )
                 (deny (with telemetry)
                     iokit-external-trap
                 )
@@ -282,14 +224,9 @@
             )
             (with telemetry-backtrace)
             (apply-message-filter
-                (allow (with telemetry) (with message "AppleIntelMEUserClient")
+                (allow
                     iokit-external-method
                 )
-                (allow iokit-external-method
-                    (iokit-method-number
-                        120
-                    )
-                )
                 (deny (with telemetry)
                     iokit-async-external-method
                     iokit-external-trap
@@ -314,14 +251,9 @@
             )
             (with telemetry-backtrace)
             (apply-message-filter
-                (allow (with telemetry) (with message "AppleSNBFBUserClient")
+                (allow
                     iokit-external-method
                 )
-                (allow iokit-external-method
-                    (iokit-method-number
-                        120
-                    )
-                )
                 (deny (with telemetry)
                     iokit-async-external-method
                     iokit-external-trap
@@ -369,18 +301,10 @@
             )
             (with telemetry-backtrace)
             (apply-message-filter
-                (allow (with telemetry) (with message "AppleGraphicsControlClient")
+                (allow
                     iokit-async-external-method
                     iokit-external-method
                 )
-                (allow iokit-external-method
-                    (iokit-method-number
-                        0
-                        1
-                        3
-                        11
-                    )
-                )
                 (deny (with telemetry)
                     iokit-external-trap
                 )
@@ -426,16 +350,9 @@
             )
             (with telemetry-backtrace)
             (apply-message-filter
-                (allow (with telemetry) (with message "AppleMGPUPowerControlClient")
+                (allow
                     iokit-external-method
                 )
-                (allow iokit-external-method
-                    (iokit-method-number
-                        0
-                        1
-                        3
-                    )
-                )
                 (deny (with telemetry)
                     iokit-async-external-method
                     iokit-external-trap
@@ -1015,18 +932,9 @@
         )
         (with telemetry-backtrace)
         (apply-message-filter
-            (allow (with telemetry) (with message "AppleUpstreamUserClient")
+            (allow
                 iokit-external-method
             )
-            (allow iokit-external-method
-                (iokit-method-number
-                    0
-                    1
-                    3
-                    4
-                    5
-                )
-            )
             (deny (with telemetry)
                 iokit-async-external-method
                 iokit-external-trap
@@ -1050,14 +958,9 @@
         )
         (with telemetry-backtrace)
         (apply-message-filter
-            (allow (with telemetry) (with message "RootDomainUserClient")
+            (allow
                 iokit-external-method
             )
-            (allow iokit-external-method
-                (iokit-method-number
-                    3
-                )
-            )
             (deny (with telemetry)
                 iokit-async-external-method
                 iokit-external-trap
@@ -1082,18 +985,9 @@
         )
         (with telemetry-backtrace)
         (apply-message-filter
-            (allow (with telemetry) (with message "AudioAUUC")
+            (allow
                 iokit-external-method
             )
-            (allow iokit-external-method
-                (iokit-method-number
-                    0
-                    1
-                    3
-                    4
-                    5
-                )
-            )
             (deny (with telemetry)
                 iokit-async-external-method
                 iokit-external-trap
@@ -2051,17 +1945,10 @@
             )
         )
         (apply-message-filter
-            (allow (with telemetry) (with message "IOSurfaceRootUserClient no extension")
+            (allow
                 iokit-async-external-method
                 iokit-external-method
             )
-            (allow iokit-external-method
-                (iokit-method-number
-                    13
-                    32
-                    44
-                )
-            )
             (deny (with telemetry)
                 iokit-external-trap
             )
@@ -2103,32 +1990,10 @@
             )
         )
         (apply-message-filter
-            (allow (with telemetry) (with message "IOAccelerator no extension")
+            (allow
                 iokit-async-external-method
                 iokit-external-method
             )
-            (allow iokit-async-external-method
-                (iokit-method-number
-                    0
-                )
-            )
-            (allow iokit-external-method
-                (iokit-method-number
-                    0
-                    1
-                    2
-                    4
-                    5
-                    7
-                    8
-                    9
-                    10
-                    11
-                    12
-                    22
-                    256
-                )
-            )
             (deny (with telemetry)
                 iokit-external-trap
             )
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to