Title: [209109] tags/Safari-603.1.13.1/Source/WebKit2

Diff

Modified: tags/Safari-603.1.13.1/Source/WebKit2/ChangeLog (209108 => 209109)


--- tags/Safari-603.1.13.1/Source/WebKit2/ChangeLog	2016-11-30 02:26:04 UTC (rev 209108)
+++ tags/Safari-603.1.13.1/Source/WebKit2/ChangeLog	2016-11-30 02:55:20 UTC (rev 209109)
@@ -1,5 +1,9 @@
 2016-11-29  Matthew Hanson  <[email protected]>
 
+        Rollout r208611.
+
+2016-11-29  Matthew Hanson  <[email protected]>
+
         Merge r209057. rdar://problem/26899976
 
     2016-11-28  Brent Fulgham  <[email protected]>

Modified: tags/Safari-603.1.13.1/Source/WebKit2/DatabaseProcess/mac/com.apple.WebKit.Databases.sb.in (209108 => 209109)


--- tags/Safari-603.1.13.1/Source/WebKit2/DatabaseProcess/mac/com.apple.WebKit.Databases.sb.in	2016-11-30 02:26:04 UTC (rev 209108)
+++ tags/Safari-603.1.13.1/Source/WebKit2/DatabaseProcess/mac/com.apple.WebKit.Databases.sb.in	2016-11-30 02:55:20 UTC (rev 209109)
@@ -1,4 +1,4 @@
-; Copyright (C) 2014-2016 Apple Inc. All rights reserved.
+; Copyright (C) 2014 Apple Inc. All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without
 ; modification, are permitted provided that the following conditions
@@ -88,5 +88,8 @@
 (if (defined? 'vnode-type)
     (deny file-write-create (vnode-type SYMLINK)))
 
+;; FIXME: Should be removed once <rdar://problem/16329087> is fixed.
+(deny file-write-xattr (xattr "com.apple.quarantine") (with no-log))
+
 ;; Reserve a namespace for additional protected extended attributes.
 (deny file-read-xattr file-write-xattr (xattr-regex #"^com\.apple\.security\.private\."))

Modified: tags/Safari-603.1.13.1/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in (209108 => 209109)


--- tags/Safari-603.1.13.1/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in	2016-11-30 02:26:04 UTC (rev 209108)
+++ tags/Safari-603.1.13.1/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in	2016-11-30 02:55:20 UTC (rev 209109)
@@ -162,6 +162,9 @@
 (if (defined? 'vnode-type)
     (deny file-write-create (vnode-type SYMLINK)))
 
+;; FIXME: Should be removed once <rdar://problem/16329087> is fixed.
+(deny file-write-xattr (xattr "com.apple.quarantine") (with no-log))
+
 ;; Reserve a namespace for additional protected extended attributes.
 (deny file-read-xattr file-write-xattr (xattr-regex #"^com\.apple\.security\.private\."))
 

Modified: tags/Safari-603.1.13.1/Source/WebKit2/PluginProcess/mac/com.apple.WebKit.plugin-common.sb.in (209108 => 209109)


--- tags/Safari-603.1.13.1/Source/WebKit2/PluginProcess/mac/com.apple.WebKit.plugin-common.sb.in	2016-11-30 02:26:04 UTC (rev 209108)
+++ tags/Safari-603.1.13.1/Source/WebKit2/PluginProcess/mac/com.apple.WebKit.plugin-common.sb.in	2016-11-30 02:55:20 UTC (rev 209109)
@@ -78,6 +78,14 @@
 (if (not (defined? 'os-version))
     (define os-version (param "_OS_VERSION")))
 
+;; OS X 10.7 (Lion) compatibility
+(if (not (defined? 'ipc-posix-shm*))
+    (define ipc-posix-shm* ipc-posix-shm))
+(if (not (defined? 'ipc-posix-shm-read*))
+    (define ipc-posix-shm-read* ipc-posix-shm))
+(if (not (defined? 'ipc-posix-shm-write-data))
+    (define ipc-posix-shm-write-data ipc-posix-shm))
+
 ;; Graphics
 (if (defined? 'system-graphics)
     (system-graphics)
@@ -239,6 +247,10 @@
     (local-name "com.apple.tsm.portname")
     (global-name-regex #"_OpenStep$"))
 
+(if (equal? os-version "10.7")
+    (allow mach-lookup
+        (global-name "com.apple.system.DirectoryService.membership_v1")))
+
 ;; Configuration directories
 (allow file-read* (subpath (param "PLUGIN_PATH")))
 (allow file-read* (subpath (param "WEBKIT2_FRAMEWORK_DIR")))
@@ -347,6 +359,29 @@
 (define (webkit-microphone)
     (allow device-microphone))
 
+(if (equal? os-version "10.7")
+    (allow ipc-posix-shm)
+    (begin
+        (if (equal? os-version "10.8")
+            (allow ipc-posix-shm*
+                (ipc-posix-name "_CS_GSHMEMLOCK")
+                (ipc-posix-name "_CS_DSHMEMLOCK")))
+        (allow ipc-posix-shm*
+            (ipc-posix-name-regex #"^AudioIO")
+            (ipc-posix-name-regex #"^CFPBS:")
+            (ipc-posix-name "com.apple.ColorSync.Gen.lock")
+            (ipc-posix-name "com.apple.ColorSync.Disp.lock")
+            (ipc-posix-name "com.apple.ColorSync.Gray2.2")
+            (ipc-posix-name "com.apple.ColorSync.sRGB")
+            (ipc-posix-name "com.apple.ColorSync.GenGray")
+            (ipc-posix-name "com.apple.ColorSync.GenRGB")
+            (ipc-posix-name-regex #"^com\.apple\.cs\.")
+            (ipc-posix-name-regex #"^ls\."))
+        (allow ipc-posix-shm-read*
+            (ipc-posix-name-regex #"^/tmp/com\.apple\.csseed\.")
+            (ipc-posix-name "FNetwork.defaultStorageSession")
+            (ipc-posix-name "apple.shm.notification_center"))))
+
 ;; Silently block access to some resources
 (deny file-read* file-write* (with no-log)
     (subpath "/Network/Library")
@@ -353,6 +388,9 @@
     (subpath "/Network/Applications")
     (home-library-preferences-regex #"/com\.apple\.internetconfig(priv)?\.plist")
 
+    ;; FIXME: Should be removed after <rdar://problem/9422957> is fixed.
+    (home-library-literal "/Caches/Cache.db")
+
     ;; FIXME: Should be removed after <rdar://problem/10463881> is fixed.
     (home-library-preferences-literal "/com.apple.LaunchServices.QuarantineEventsV2")
     (home-library-preferences-literal "/com.apple.LaunchServices.QuarantineEventsV2-journal"))

Modified: tags/Safari-603.1.13.1/Source/WebKit2/Resources/PlugInSandboxProfiles/com.oracle.java.JavaAppletPlugin.sb (209108 => 209109)


--- tags/Safari-603.1.13.1/Source/WebKit2/Resources/PlugInSandboxProfiles/com.oracle.java.JavaAppletPlugin.sb	2016-11-30 02:26:04 UTC (rev 209108)
+++ tags/Safari-603.1.13.1/Source/WebKit2/Resources/PlugInSandboxProfiles/com.oracle.java.JavaAppletPlugin.sb	2016-11-30 02:55:20 UTC (rev 209109)
@@ -33,6 +33,13 @@
     (global-name "com.apple.coreservices.launchservicesd")
     (global-name-regex #"^PlaceHolderServerName-"))
 
+(if (equal? os-version "10.7")
+    (begin
+        (allow mach-lookup
+            (global-name-regex #"^com\.apple\.java\.jrs\.carenderserver"))
+        (allow file-read* file-write*
+            (home-library-subpath "/Caches/net.java.openjdk.cmd"))))
+
 (allow file-read*
     (literal "/dev/fd")
     (literal "/usr/bin")

Modified: tags/Safari-603.1.13.1/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in (209108 => 209109)


--- tags/Safari-603.1.13.1/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in	2016-11-30 02:26:04 UTC (rev 209108)
+++ tags/Safari-603.1.13.1/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in	2016-11-30 02:55:20 UTC (rev 209109)
@@ -146,7 +146,14 @@
     (ipc-posix-name-regex #"^WebKit Test-"))
 
 ;; ColorSync
+;; FIXME: Remove names with underscores when possible (see <rdar://problem/13072721>).
 (allow ipc-posix-shm*
+    (ipc-posix-name "_CS_GSHMEMLOCK")
+    (ipc-posix-name "_CS_DSHMEMLOCK")
+    (ipc-posix-name "_CSGRAYPROFILE")
+    (ipc-posix-name "_CSRGBPROFILE")
+    (ipc-posix-name "_CSGENGPROFILE")
+    (ipc-posix-name "_CSGENRPROFILE")
     (ipc-posix-name "com.apple.ColorSync.Gen.lock")
     (ipc-posix-name "com.apple.ColorSync.Disp.lock")
     (ipc-posix-name "com.apple.ColorSync.Gray2.2")
@@ -282,6 +289,9 @@
 (if (defined? 'vnode-type)
         (deny file-write-create (vnode-type SYMLINK)))
 
+;; FIXME: Should be removed once <rdar://problem/16329087> is fixed.
+(deny file-write-xattr (xattr "com.apple.quarantine") (with no-log))
+
 ;; Reserve a namespace for additional protected extended attributes.
 (deny file-read-xattr file-write-xattr (xattr-regex #"^com\.apple\.security\.private\."))
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to