[rpms/chromium] epel9-next: Add CFI suppressions for inline PipeWire functions

[rpms/chromium] epel9-next: Add CFI suppressions for inline PipeWire functions

[Jan Grulich]

A new commit has been pushed.

Repo   : rpms/chromium
Branch : epel9-next
Commit : 6e28cb22e9694d0b4365ab61cd66634224f4117e
Author : Jan Grulich <jgrulich@redhat.com>
Date   : 2025-04-02T07:52:09+02:00
Stats  : +49/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/chromium/c/6e28cb22e9694d0b4365ab61cd66634224f4117e?branch=epel9-next

Log:
Add CFI suppressions for inline PipeWire functions

---
diff --git a/chromium-135-add-cfi-suppressions-for-pipewire-functions.patch b/chromium-135-add-cfi-suppressions-for-pipewire-functions.patch
new file mode 100644
index 0000000..d4c8f14
--- /dev/null
+++ b/chromium-135-add-cfi-suppressions-for-pipewire-functions.patch
@@ -0,0 +1,39 @@
+From 0eebf40b9914bca8fe69bef8eea89522c1a5d4ce Mon Sep 17 00:00:00 2001
+From: Jan Grulich <grulja@gmail.com>
+Date: Tue, 01 Apr 2025 12:23:37 -0700
+Subject: [PATCH] Add more CFI suppressions for inline PipeWire functions
+
+There are now more inline functions with PipeWire 1.4, which are causing
+SIGILL as we hit CFI check.
+
+Bug: chromium:354776214
+Change-Id: I055dd7edcaf3ca190ec7b4cc576ebe97a2baf82f
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6421030
+Reviewed-by: Peter Collingbourne <pcc@chromium.org>
+Reviewed-by: Alexander Cooper <alcooper@chromium.org>
+Commit-Queue: Jan Grulich <grulja@gmail.com>
+Cr-Commit-Position: refs/heads/main@{#1441109}
+---
+
+diff --git a/tools/cfi/ignores.txt b/tools/cfi/ignores.txt
+index 9a1180e..0a002bc6 100644
+--- a/tools/cfi/ignores.txt
++++ b/tools/cfi/ignores.txt
+@@ -260,8 +260,16 @@
+ src:*third_party/skia/src/ports/SkFontHost_FreeType.cpp
+ 
+ # WebRTC / PipeWire
+-fun:*pw_registry_bind*
++fun:*pw_core_add_listener*
+ fun:*pw_core_get_registry*
++fun:*pw_core_sync*
++fun:*pw_node_add_listener*
++fun:*pw_node_enum_params*
++fun:*pw_loop_add_event*
++fun:*pw_loop_signal_event*
++fun:*pw_registry_add_listener*
++fun:*pw_registry_bind*
++fun:*spa_loop_utils*
+ 
+ ######### Function pointers cast to incorrect type signatures
+ 

diff --git a/chromium.spec b/chromium.spec
index 403a9b7..251097a 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -262,7 +262,7 @@
 
 Name:	chromium
 Version: 135.0.7049.52
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use
 Url: http://www.chromium.org/Home
 License: BSD-3-Clause AND LGPL-2.1-or-later AND Apache-2.0 AND IJG AND MIT AND GPL-2.0-or-later AND ISC AND OpenSSL AND (MPL-1.1 OR GPL-2.0-only OR LGPL-2.0-only)
@@ -447,6 +447,9 @@ Patch417: flatpak-Adjust-paths-for-the-sandbox.patch
 Patch418: flatpak-Expose-Widevine-into-the-sandbox.patch
 
 # upstream patches
+# https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/4636
+# https://chromium-review.googlesource.com/c/chromium/src/+/6421030
+Patch500: chromium-135-add-cfi-suppressions-for-pipewire-functions.patch
 
 # Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
 # http://build.chromium.org/buildbot/official/
@@ -1129,6 +1132,9 @@ Qt6 UI for chromium.
 %patch -P418 -p1 -b .flatpak-widevine
 %endif
 
+# Upstream patches
+%patch -P500 -p1 -b .add-cfi-suppressions-for-pipewire-functions
+
 # Change shebang in all relevant files in this directory and all subdirectories
 # See `man find` for how the `-exec command {} +` syntax works
 find -type f \( -iname "*.py" \) -exec sed -i '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{chromium_pybin}=' {} +
@@ -1764,6 +1770,9 @@ fi
 %endif
 
 %changelog
+* Wed Apr 02 2025 Jan Grulich <jgrulich@redhat.com> - 135.0.7049.52-2
+- Add CFI suppressions for inline PipeWire functions
+
 * Tue Apr 01 2025 Than Ngo <than@redhat.com> - 135.0.7049.52-1
 - Update to 135.0.7049.52