From 583fe61da24f865e1da49dc1ad1b297c7c9cf6d4 Mon Sep 17 00:00:00 2001
From: Peter Kvitek <[email protected]>
Date: Thu, 28 May 2026 12:14:28 -0700
Subject: [PATCH] [headless][linux] Safeguard headless window code against potential UAF

ui::HeadlessWindow synchronously callsbacks delegate methods during state-changing operations. If an observer synchronously closes the widget during these callbacks, the associated ui::HeadlessWindow instance is deleted while its methods are still executing on the stack.

This CL adds weak ptr checks to avoid ui::HeadlessWindow code execution after a delegate callback that invalidates 'this'.

Bug: 516674532
Change-Id: I788ba9b19c733c7af17010744bd66b25783ddf9c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7879467
Commit-Queue: Peter Kvitek <[email protected]>
Reviewed-by: Colin Blundell <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1637863}
---

diff --git a/ui/ozone/BUILD.gn b/ui/ozone/BUILD.gn
index 7bf64c4..0bd2b4e8 100644
--- a/ui/ozone/BUILD.gn
+++ b/ui/ozone/BUILD.gn
@@ -37,6 +37,7 @@
 if (ozone_platform_headless) {
   ozone_platforms += [ "headless" ]
   ozone_platform_deps += [ "platform/headless" ]
+  ozone_platform_test_deps += [ "platform/headless:headless_unittests" ]
 }
 
 if (ozone_platform_drm) {
@@ -356,6 +357,7 @@
   visibility = [
     ":*",
     "platform/flatland:flatland_unittests",
+    "platform/headless:headless_unittests",
     "platform/wayland:test_support",
     "platform/wayland:wayland_unittests",
     "platform/x11:x11_unittests",
diff --git a/ui/ozone/platform/headless/BUILD.gn b/ui/ozone/platform/headless/BUILD.gn
index 65005840..dc07e2b6 100644
--- a/ui/ozone/platform/headless/BUILD.gn
+++ b/ui/ozone/platform/headless/BUILD.gn
@@ -59,3 +59,18 @@
     deps += [ "//gpu/vulkan" ]
   }
 }
+
+source_set("headless_unittests") {
+  testonly = true
+  sources = [ "headless_window_unittest.cc" ]
+  deps = [
+    ":headless",
+    "//base",
+    "//base/test:test_support",
+    "//testing/gtest",
+    "//ui/display:test_support",
+    "//ui/events:test_support",
+    "//ui/ozone:platform",
+    "//ui/ozone:test_support",
+  ]
+}
diff --git a/ui/ozone/platform/headless/headless_window.cc b/ui/ozone/platform/headless/headless_window.cc
index d11ccc5..a0061fa 100644
--- a/ui/ozone/platform/headless/headless_window.cc
+++ b/ui/ozone/platform/headless/headless_window.cc
@@ -78,18 +78,31 @@
     return;
   }
 
+  // PlatformWindowDelegate callbacks can destroy the window, invalidating
+  // `this`. Keep a weak pointer and check it after each callback, here and
+  // below.
+  auto weak_ptr = GetWeakPtr();
+
   if (fullscreen) {
     if (window_state_ != PlatformWindowState::kMaximized &&
         window_state_ != PlatformWindowState::kFullScreen) {
       restored_bounds_ = bounds_;
     }
     ZoomWindowBounds();
+    if (!weak_ptr) {
+      return;
+    }
+
     UpdateWindowState(PlatformWindowState::kFullScreen);
   } else {
     if (window_state_ != PlatformWindowState::kFullScreen) {
       return;
     }
     RestoreWindowBounds();
+    if (!weak_ptr) {
+      return;
+    }
+
     UpdateWindowState(PlatformWindowState::kNormal);
   }
 }
@@ -101,21 +114,37 @@
 
   if (window_state_ != PlatformWindowState::kMaximized &&
       window_state_ != PlatformWindowState::kFullScreen) {
+    auto weak_ptr = GetWeakPtr();
+
     restored_bounds_ = bounds_;
     ZoomWindowBounds();
+    if (!weak_ptr) {
+      return;
+    }
+
     UpdateWindowState(PlatformWindowState::kMaximized);
   }
 }
 
 void HeadlessWindow::Minimize() {
   if (window_state_ != PlatformWindowState::kMinimized) {
+    auto weak_ptr = GetWeakPtr();
+
     // Minimized window retains its size and position, however, it's made
     // hidden by Aura.
     if (window_state_ == PlatformWindowState::kMaximized ||
         window_state_ == PlatformWindowState::kFullScreen) {
       RestoreWindowBounds();
+      if (!weak_ptr) {
+        return;
+      }
     }
+
     UpdateWindowState(PlatformWindowState::kMinimized);
+    if (!weak_ptr) {
+      return;
+    }
+
     // Minimized windows are inactive. Aura activates minimized windows
     // when restoring. If we don't deactivate the window here, the subsequent
     // activation will be optimized away, causing https://crbug.com/358998544.
@@ -125,7 +154,13 @@
 
 void HeadlessWindow::Restore() {
   if (window_state_ != PlatformWindowState::kNormal) {
+    auto weak_ptr = GetWeakPtr();
+
     RestoreWindowBounds();
+    if (!weak_ptr) {
+      return;
+    }
+
     UpdateWindowState(PlatformWindowState::kNormal);
   }
 }
diff --git a/ui/ozone/platform/headless/headless_window.h b/ui/ozone/platform/headless/headless_window.h
index 646e398..a7dc0249 100644
--- a/ui/ozone/platform/headless/headless_window.h
+++ b/ui/ozone/platform/headless/headless_window.h
@@ -9,6 +9,7 @@
 
 #include "base/memory/raw_ptr.h"
 #include "base/memory/scoped_refptr.h"
+#include "base/memory/weak_ptr.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image_skia.h"
@@ -73,6 +74,10 @@
  protected:
   PlatformWindowDelegate* delegate() { return delegate_; }
 
+  base::WeakPtr<HeadlessWindow> GetWeakPtr() {
+    return weak_ptr_factory_.GetWeakPtr();
+  }
+
  private:
   enum class ActivationState {
     kUnknown,
@@ -90,6 +95,8 @@
   std::optional<gfx::Rect> restored_bounds_;
   PlatformWindowState window_state_ = PlatformWindowState::kUnknown;
   ActivationState activation_state_ = ActivationState::kUnknown;
+
+  base::WeakPtrFactory<HeadlessWindow> weak_ptr_factory_{this};
 };
 
 }  // namespace ui
diff --git a/ui/ozone/platform/headless/headless_window_unittest.cc b/ui/ozone/platform/headless/headless_window_unittest.cc
new file mode 100644
index 0000000..0881a98
--- /dev/null
+++ b/ui/ozone/platform/headless/headless_window_unittest.cc
@@ -0,0 +1,143 @@
+// Copyright 2026 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ui/ozone/platform/headless/headless_window.h"
+
+#include <memory>
+
+#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/display/test/test_screen.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/ozone/platform/headless/headless_window_manager.h"
+#include "ui/platform_window/platform_window_delegate.h"
+

diff --git a/ui/ozone/platform/headless/headless_window_unittest.cc b/ui/ozone/platform/headless/headless_window_unittest.cc
new file mode 100644
index 0000000..0881a98
--- /dev/null
+++ b/ui/ozone/platform/headless/headless_window_unittest.cc
@@ -0,0 +1,143 @@
+// Copyright 2026 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ui/ozone/platform/headless/headless_window.h"
+
+#include <memory>
+
+#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/display/test/test_screen.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/ozone/platform/headless/headless_window_manager.h"
+#include "ui/platform_window/platform_window_delegate.h"
+
+namespace ui {
+namespace {
+
+// A PlatformWindowDelegate that simulates the production behaviour of
+// DesktopWindowTreeHostPlatform: when the platform window calls back into the
+// delegate (OnBoundsChanged / OnWindowStateChanged), an observer may
+// synchronously call Widget::CloseNow(), which ends up calling
+// HeadlessWindow::Close() -> delegate_->OnClosed() ->
+// DWTHP::OnClosed() -> SetPlatformWindow(nullptr) -> ~HeadlessWindow().
+//
+// This delegate models that by resetting its owned unique_ptr<PlatformWindow>
+// from inside the chosen callback.
+class DestroyingDelegate : public PlatformWindowDelegate {
+ public:
+  enum class DestroyOn {
+    kNone,
+    kBoundsChanged,
+    kWindowStateChanged,
+  };
+
+  explicit DestroyingDelegate(DestroyOn destroy_on) : destroy_on_(destroy_on) {}
+  ~DestroyingDelegate() override = default;
+
+  void set_destroy_on(DestroyOn destroy_on) { destroy_on_ = destroy_on; }
+
+  void SetWindow(std::unique_ptr<PlatformWindow> window) {
+    window_ = std::move(window);
+  }
+
+  // PlatformWindowDelegate:
+  void OnBoundsChanged(const BoundsChange& change) override {
+    if (destroy_on_ == DestroyOn::kBoundsChanged) {
+      window_.reset();
+    }
+  }
+  void OnDamageRect(const gfx::Rect& damaged_region) override {}
+  void DispatchEvent(Event* event) override {}
+  void OnCloseRequest() override {}
+  void OnClosed() override { window_.reset(); }
+  void OnWindowStateChanged(PlatformWindowState old_state,
+                            PlatformWindowState new_state) override {
+    if (destroy_on_ == DestroyOn::kWindowStateChanged) {
+      window_.reset();
+    }
+  }
+  void OnLostCapture() override {}
+  void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget) override {}
+  void OnWillDestroyAcceleratedWidget() override {}
+  void OnAcceleratedWidgetDestroyed() override {}
+  void OnActivationChanged(bool active) override {}
+  void OnCursorUpdate() override {}
+  bool CanMaximize() const override { return true; }
+  bool CanFullscreen() const override { return true; }
+  gfx::Rect ConvertRectToPixels(const gfx::Rect& rect_in_dip) const override {
+    return rect_in_dip;
+  }
+  gfx::Rect ConvertRectToDIP(const gfx::Rect& rect_in_pixels) const override {
+    return rect_in_pixels;
+  }
+
+ private:
+  DestroyOn destroy_on_ = DestroyOn::kNone;
+  std::unique_ptr<PlatformWindow> window_;
+};
+
+class HeadlessWindowCrashTest : public ::testing::Test {
+ public:
+  HeadlessWindowCrashTest() = default;
+  ~HeadlessWindowCrashTest() override = default;
+
+ protected:
+  display::test::TestScreen test_screen_{/*create_display=*/true,
+                                         /*register_screen=*/true};
+  HeadlessWindowManager manager_;
+};
+
+TEST_F(HeadlessWindowCrashTest, DestroyViaObserverInSetFullscreen) {
+  DestroyingDelegate delegate(DestroyingDelegate::DestroyOn::kBoundsChanged);
+
+  auto window = std::make_unique<HeadlessWindow>(&delegate, &manager_,
+                                                 gfx::Rect(0, 0, 100, 100));
+  HeadlessWindow* headless_window = window.get();
+  delegate.SetWindow(std::move(window));
+
+  headless_window->SetFullscreen(/*fullscreen=*/true,
+                                 /*target_display_id=*/-1);
+}
+
+TEST_F(HeadlessWindowCrashTest, DestroyViaObserverInMaximize) {
+  DestroyingDelegate delegate(
+      DestroyingDelegate::DestroyOn::kWindowStateChanged);
+
+  auto window = std::make_unique<HeadlessWindow>(&delegate, &manager_,
+                                                 gfx::Rect(0, 0, 100, 100));
+  HeadlessWindow* headless_window = window.get();
+  delegate.SetWindow(std::move(window));
+
+  headless_window->Maximize();
+}
+
+TEST_F(HeadlessWindowCrashTest, DestroyViaObserverInMinimize) {
+  DestroyingDelegate delegate(
+      DestroyingDelegate::DestroyOn::kWindowStateChanged);
+
+  auto window = std::make_unique<HeadlessWindow>(&delegate, &manager_,
+                                                 gfx::Rect(0, 0, 100, 100));
+  HeadlessWindow* headless_window = window.get();
+  delegate.SetWindow(std::move(window));
+
+  headless_window->Minimize();
+}
+
+TEST_F(HeadlessWindowCrashTest, DestroyViaObserverInRestore) {
+  DestroyingDelegate delegate(DestroyingDelegate::DestroyOn::kNone);
+
+  auto window = std::make_unique<HeadlessWindow>(&delegate, &manager_,
+                                                 gfx::Rect(0, 0, 100, 100));
+  HeadlessWindow* headless_window = window.get();
+  delegate.SetWindow(std::move(window));
+
+  headless_window->Maximize();
+
+  delegate.set_destroy_on(DestroyingDelegate::DestroyOn::kBoundsChanged);
+
+  headless_window->Restore();
+}
+
+}  // namespace
+}  // namespace ui