From f08b11943885dc24703baab0b136c45911fe3a93 Mon Sep 17 00:00:00 2001 From: Vasiliy Telezhnikov Date: Thu, 19 Jan 2023 19:16:55 +0000 Subject: [Backport] Security bug 1406115 Cherry-pick of patch originally reviewed on https://chromium-review.googlesource.com/c/chromium/src/+/4178714 Remove NUM_COMMAND_BUFFER_NAMESPACES from SyncToken.mojom Mojo validates input for allowed values, NUM_COMMAND_BUFFER_NAMESPACES is not valid value to send over ipc and is used only to know maximum value in code. (cherry picked from commit d652130c4bc2842d5df5488c69ef4f3168634a54) Bug: 1406115 Change-Id: I8e5c3b6b2a9a9206fbeb377b27ceb1242a4f54e2 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4167409 Reviewed-by: danakj Commit-Queue: Vasiliy Telezhnikov Cr-Original-Commit-Position: refs/heads/main@{#1093100} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4178714 Bot-Commit: Rubber Stamper Cr-Commit-Position: refs/branch-heads/5359@{#1352} Cr-Branched-From: 27d3765d341b09369006d030f83f582a29eb57ae-refs/heads/main@{#1058933} Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/456881 Reviewed-by: Michal Klocek Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/461408 Reviewed-by: Allan Sandfeld Jensen --- chromium/gpu/ipc/common/sync_token.mojom | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/chromium/gpu/ipc/common/sync_token.mojom b/chromium/gpu/ipc/common/sync_token.mojom index 7c957007e3a..b24017647aa 100644 --- a/chromium/gpu/ipc/common/sync_token.mojom +++ b/chromium/gpu/ipc/common/sync_token.mojom @@ -11,9 +11,7 @@ enum CommandBufferNamespace { GPU_IO, IN_PROCESS, MOJO, - MOJO_LOCAL, - - NUM_COMMAND_BUFFER_NAMESPACES + MOJO_LOCAL }; // See gpu/command_buffer/common/sync_token.h -- cgit v1.2.1