diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2024-03-04 16:25:17 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-03-15 12:39:47 +0000 |
| commit | cc2855912b85a956fdc63be8b4c8daf1d08d45d3 (patch) | |
| tree | 7a730e5d9d2091fafd2107350aa91987156c765f | |
| parent | e09af22df3877e20728e333cd847080f4a4ea1bf (diff) | |
Update Chromium
Submodule src/3rdparty 707f4e7c..326fa478:
* [Backport] CVE-2024-25062 / Security bug 325094430
* [Backport] CVE-2024-1671: Inappropriate implementation in Site Isolation (2/2)
* [Backport] CVE-2024-1671: Inappropriate implementation in Site Isolation (1/2)
* [Backport] CVE-2024-1676: Inappropriate implementation in Navigation
* [Backport] CVE-2024-1672: Inappropriate implementation in Content Security Policy.
* [Backport] CVE-2024-1670: Use after free in Mojo
* [Backport] Security bug 1504473 / 40945008
* [Backport] Security bug 1508758 / 41481379
* [Backport] Security bug 1518994
* Do not assert when ozone uses qt platform with vaapi
Fixes: QTBUG-122931
Change-Id: I6b9d3a8a4272e24fe818dc048113b170a3b191b5
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 9976aa426166012ede784b5806318ad296dfb331)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 33ee3e6993dfec635cb0e9609a98f4ffd8f23d27)
| -rw-r--r-- | CHROMIUM_VERSION | 2 | ||||
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/core/web_engine_context.cpp | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/CHROMIUM_VERSION b/CHROMIUM_VERSION index 76c045625..9dcbd6f68 100644 --- a/CHROMIUM_VERSION +++ b/CHROMIUM_VERSION @@ -1,3 +1,3 @@ Based on Chromium version: 112.0.5615.213 -Patched with security patches up to Chromium version: 121.0.6167.160 +Patched with security patches up to Chromium version: 122.0.6261.111 diff --git a/src/3rdparty b/src/3rdparty -Subproject 707f4e7c0110c33df3d36a1942ad1b0ea2cb997 +Subproject 326fa4785ac0d23aa9cf21979b6bccbd03a7ba5 diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index ae85bb2d6..57d6642bd 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -985,7 +985,7 @@ const char *qWebEngineChromiumVersion() noexcept const char *qWebEngineChromiumSecurityPatchVersion() noexcept { - return "121.0.6167.160"; // FIXME: Remember to update + return "122.0.6261.111"; // FIXME: Remember to update } QT_END_NAMESPACE |