Branch: refs/heads/safari-7614.3.6.11-branch
Home: https://github.com/WebKit/WebKit
Commit: 74e625c00172f1e9d5e35a50532113c4afbf13c8
https://github.com/WebKit/WebKit/commit/74e625c00172f1e9d5e35a50532113c4afbf13c8
Author: Alan Coon <[email protected]>
Date: 2022-11-08 (Tue, 08 Nov 2022)
Changed paths:
M Source/JavaScriptCore/Configurations/Version.xcconfig
M Source/ThirdParty/ANGLE/Configurations/Version.xcconfig
M Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig
M Source/WebCore/Configurations/Version.xcconfig
M Source/WebCore/PAL/Configurations/Version.xcconfig
M Source/WebGPU/Configurations/Version.xcconfig
M Source/WebInspectorUI/Configurations/Version.xcconfig
M Source/WebKit/Configurations/Version.xcconfig
M Source/WebKitLegacy/mac/Configurations/Version.xcconfig
Log Message:
-----------
Versioning.
WebKit-7614.3.6.11.1
Canonical link: https://commits.webkit.org/[email protected]
Commit: bf969466e0cbca287924d8ed961e4365854d7f8e
https://github.com/WebKit/WebKit/commit/bf969466e0cbca287924d8ed961e4365854d7f8e
Author: Alan Coon <[email protected]>
Date: 2022-11-08 (Tue, 08 Nov 2022)
Changed paths:
M Source/WebKit/UIProcess/Cocoa/WebViewImpl.h
M Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
Log Message:
-----------
Apply patch. rdar://problem/101872145
Cherry-pick of fcfc9e6f2890.
Canonical link: https://commits.webkit.org/[email protected]
Commit: e855a3691f814bcf4864c389f0e103614002181b
https://github.com/WebKit/WebKit/commit/e855a3691f814bcf4864c389f0e103614002181b
Author: Michael Saboff <[email protected]>
Date: 2022-11-08 (Tue, 08 Nov 2022)
Changed paths:
M Source/WebKit/Configurations/WebContentService.Crashy.xcconfig
M Source/WebKit/UIProcess/WebProcessPool.h
M Source/WebKit/UIProcess/WebProcessProxy.h
Log Message:
-----------
Cherry-pick 2fb42dcd321a. rdar://problem/101876374
The crashy WebKit XPC service causes Safari to Crash on iOS
https://bugs.webkit.org/show_bug.cgi?id=247395
rdar://101876374
Reviewed by Chris Dumez.
When calling sendToAllProcessesForSession(), we should ignore crashy
WebProcesses.
Also fixed WebContent.Crashy configuration for iOS so that we install the
service and don't
change the code signing flags.
* Source/WebKit/Configurations/WebContentService.Crashy.xcconfig:
* Source/WebKit/UIProcess/WebProcessPool.h:
(WebKit::WebProcessPool::sendToAllProcessesForSession):
* Source/WebKit/UIProcess/WebProcessProxy.h:
(WebKit::WebProcessProxy::isCrashyProcess const):
(WebKit::WebProcessProxy::isCrashyProcess): Deleted.
Canonical link: https://commits.webkit.org/256434@main
Canonical link: https://commits.webkit.org/[email protected]
Commit: 66a8f564bcd33e9d4fe7b562165c076d4050e385
https://github.com/WebKit/WebKit/commit/66a8f564bcd33e9d4fe7b562165c076d4050e385
Author: Alan Coon <[email protected]>
Date: 2022-11-09 (Wed, 09 Nov 2022)
Changed paths:
M Source/JavaScriptCore/Configurations/Version.xcconfig
M Source/ThirdParty/ANGLE/Configurations/Version.xcconfig
M Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig
M Source/WebCore/Configurations/Version.xcconfig
M Source/WebCore/PAL/Configurations/Version.xcconfig
M Source/WebGPU/Configurations/Version.xcconfig
M Source/WebInspectorUI/Configurations/Version.xcconfig
M Source/WebKit/Configurations/Version.xcconfig
M Source/WebKitLegacy/mac/Configurations/Version.xcconfig
Log Message:
-----------
Versioning.
WebKit-7614.3.6.11.2
Canonical link: https://commits.webkit.org/[email protected]
Commit: 94f9a5af886d93cdb2f0bedb569e79b404a6dadd
https://github.com/WebKit/WebKit/commit/94f9a5af886d93cdb2f0bedb569e79b404a6dadd
Author: Alan Coon <[email protected]>
Date: 2022-11-10 (Thu, 10 Nov 2022)
Changed paths:
M Source/JavaScriptCore/Configurations/Version.xcconfig
M Source/ThirdParty/ANGLE/Configurations/Version.xcconfig
M Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig
M Source/WebCore/Configurations/Version.xcconfig
M Source/WebCore/PAL/Configurations/Version.xcconfig
M Source/WebGPU/Configurations/Version.xcconfig
M Source/WebInspectorUI/Configurations/Version.xcconfig
M Source/WebKit/Configurations/Version.xcconfig
M Source/WebKitLegacy/mac/Configurations/Version.xcconfig
Log Message:
-----------
Versioning.
WebKit-7614.3.6.11.3
Canonical link: https://commits.webkit.org/[email protected]
Commit: f8eed66238ebabfebca1961734e1dc8bd5a26d37
https://github.com/WebKit/WebKit/commit/f8eed66238ebabfebca1961734e1dc8bd5a26d37
Author: Ben Nham <[email protected]>
Date: 2022-11-10 (Thu, 10 Nov 2022)
Changed paths:
M Source/WebKit/Platform/cocoa/SharedMemoryCocoa.cpp
Log Message:
-----------
Cherry-pick eece793cfe01. rdar://problem/99827403
Shared memory IPC sometimes fails under Rosetta
https://bugs.webkit.org/show_bug.cgi?id=247691
rdar://99827403
Reviewed by Geoffrey Garen.
Sending a SharedMemory object over IPC sometimes fails when the sending
process runs under Rosetta
and the receiving process is ARM64. This is due to the Rosetta process
using a 4KB page size and the
receiving process using a 16KB page size. On the sending side, SharedMemory
calls `safeRoundPage` on
the actual size to round the allocation up to a 4KB boundary. On the
receiving side, SharedMemory
calls `safeRoundPage` again on the actual size, but now rounds up to a 16KB
boundary. This means the
receiving side might try to ask the kernel to map a larger memory region
that was created on the
sending side. This causes `mach_vm_map` to fail with an invalid argument
error.
One easy way to trigger this issue is to implement a URL scheme handler in
a Rosetta UIProcess that
returns some small payload. This will result in a buffer being sent to an
ARM WebContent process.
To fix this, the kernel team recommended that we:
1. Stop rounding the page size in user space. The syscalls we use here
(e.g. mach_vm_allocate) are
already documented to handle page rounding for you.
2. Defensively handle the case where we might try to share a
non-page-aligned region. (This actually
doesn't apply in our case since `SharedMemory::allocate` is always
returning a page-aligned region
but it's good to do in case someone adds that capability in the future.) We
do this by using
`MAP_MEM_USE_DATA_ADDR` with `mach_make_memory_entry_64` and
`VM_FLAGS_RETURN_DATA_ADDR` with
`mach_vm_map`.
This patch implements those recommendations.
To test this, I ran `URLSchemeHandler.Basic` under Rosetta. Before this
patch, WebContent crashed
with the assert `Received invalid message:
'WebPage_URLSchemeTaskDidReceiveData'`. After this patch,
the test no longer crashes.
* Source/WebKit/Platform/cocoa/SharedMemoryCocoa.cpp:
(WebKit::SharedMemory::Handle::decode):
(WebKit::SharedMemory::allocate):
(WebKit::makeMemoryEntry):
(WebKit::SharedMemory::map):
(WebKit::SharedMemory::~SharedMemory):
(WebKit::SharedMemory::createHandle):
(WebKit::safeRoundPage): Deleted.
Canonical link: https://commits.webkit.org/256505@main
Canonical link: https://commits.webkit.org/[email protected]
Commit: 142a79391bb0c2e3629b4bc09d24920c88f27423
https://github.com/WebKit/WebKit/commit/142a79391bb0c2e3629b4bc09d24920c88f27423
Author: Alan Coon <[email protected]>
Date: 2022-11-10 (Thu, 10 Nov 2022)
Changed paths:
M Source/WebKit/Platform/cocoa/SharedMemoryCocoa.cpp
Log Message:
-----------
Apply build fix. rdar://problem/99827403
error: no member named 'm_handle' in 'WebKit::SharedMemory::Handle'
Canonical link: https://commits.webkit.org/[email protected]
Commit: 07fee0f693b06f48a05c7afa26a5f3898d34bedf
https://github.com/WebKit/WebKit/commit/07fee0f693b06f48a05c7afa26a5f3898d34bedf
Author: Alan Coon <[email protected]>
Date: 2022-11-10 (Thu, 10 Nov 2022)
Changed paths:
M Source/WebKit/Platform/cocoa/SharedMemoryCocoa.cpp
Log Message:
-----------
Apply build fix. rdar://problem/99827403
Use m_port.
Canonical link: https://commits.webkit.org/[email protected]
Commit: 6b55a718db1b717f5736aebcf909a4dc46945ce0
https://github.com/WebKit/WebKit/commit/6b55a718db1b717f5736aebcf909a4dc46945ce0
Author: Alan Coon <[email protected]>
Date: 2022-11-10 (Thu, 10 Nov 2022)
Changed paths:
M Source/WebKit/Platform/cocoa/SharedMemoryCocoa.cpp
Log Message:
-----------
Revert build fix. rdar://problem/99827403
This reverts commit 07fee0f693b06f48a05c7afa26a5f3898d34bedf.
Canonical link: https://commits.webkit.org/[email protected]
Commit: 3099f80cf6fc1a40b0424abc5805753335b7df02
https://github.com/WebKit/WebKit/commit/3099f80cf6fc1a40b0424abc5805753335b7df02
Author: Alan Coon <[email protected]>
Date: 2022-11-10 (Thu, 10 Nov 2022)
Changed paths:
M Source/WebKit/Platform/cocoa/SharedMemoryCocoa.cpp
Log Message:
-----------
Revert build fix. rdar://problem/99827403
This reverts commit 142a79391bb0c2e3629b4bc09d24920c88f27423.
Canonical link: https://commits.webkit.org/[email protected]
Commit: cf60e5f64651b7bb5bbb5cc5c172388f582668f4
https://github.com/WebKit/WebKit/commit/cf60e5f64651b7bb5bbb5cc5c172388f582668f4
Author: Alan Coon <[email protected]>
Date: 2022-11-10 (Thu, 10 Nov 2022)
Changed paths:
M Source/WebKit/Platform/cocoa/SharedMemoryCocoa.cpp
Log Message:
-----------
Revert eece793cfe01. rdar://problem/99827403
This reverts commit f8eed66238ebabfebca1961734e1dc8bd5a26d37.
Canonical link: https://commits.webkit.org/[email protected]
Compare: https://github.com/WebKit/WebKit/compare/74e625c00172%5E...cf60e5f64651
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
