Title: [154492] branches/safari-537-branch/Source/WebKit2
- Revision
- 154492
- Author
- [email protected]
- Date
- 2013-08-23 09:56:17 -0700 (Fri, 23 Aug 2013)
Log Message
Merged r154473. <rdar://problem/14814461>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebKit2/ChangeLog (154491 => 154492)
--- branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-08-23 16:54:04 UTC (rev 154491)
+++ branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-08-23 16:56:17 UTC (rev 154492)
@@ -1,5 +1,24 @@
2013-08-23 Lucas Forschler <[email protected]>
+ Merge r154473
+
+ 2013-08-22 Simon Cooper <[email protected]>
+
+ Need to disable FakeSYSVSHM when sandboxing is not enabled
+ https://bugs.webkit.org/show_bug.cgi?id=120182
+ <rdar://problem/14814461>
+
+ Reviewed by Alexey Proskuryakov.
+
+ When not in a sandbox do not enable the FakeSYSVSHIM. This
+ allows LocalConnection to work when Flash Player is run in
+ "Unsafe Mode".
+
+ * PluginProcess/mac/PluginProcessShim.mm:
+ (WebKit::shim_disabled):
+
+2013-08-23 Lucas Forschler <[email protected]>
+
Merge r154433
2013-08-21 Tim Horton <[email protected]>
Modified: branches/safari-537-branch/Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm (154491 => 154492)
--- branches/safari-537-branch/Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm 2013-08-23 16:54:04 UTC (rev 154491)
+++ branches/safari-537-branch/Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm 2013-08-23 16:56:17 UTC (rev 154492)
@@ -37,6 +37,16 @@
#include <sys/ipc.h>
#include <sys/mman.h>
+#undef __APPLE_API_PRIVATE
+#include <sandbox.h>
+
+#ifndef _SANDBOX_PRIVATE_H_
+enum sandbox_filter_type {
+ SANDBOX_FILTER_NONE,
+};
+extern "C" int sandbox_check(pid_t pid, const char *operation, enum sandbox_filter_type type, ...);
+#endif
+
namespace WebKit {
extern "C" void WebKitPluginProcessShimInitialize(const PluginProcessShimCallbacks& callbacks);
@@ -178,8 +188,11 @@
if (keyExistsAndHasValidFormat && prefValue)
isFakeSHMDisabled = true;
+ else if (sandbox_check(getpid(), NULL, SANDBOX_FILTER_NONE) == 1)
+ isFakeSHMDisabled = false; // Sandboxed
else
- isFakeSHMDisabled = false;
+ isFakeSHMDisabled = true; // Not Sandboxed
+
});
return isFakeSHMDisabled;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
