import OL

udisks-2.10.91-manager_loopsetup_fd_bounds.patch

@@ -0,0 +1,30 @@
+From 55e36ef2af4fbfc92aab5cef50a69123e321f9f1 Mon Sep 17 00:00:00 2001
+From: Marc Deslauriers <marc.deslauriers@canonical.com>
+Date: Tue, 15 Jul 2025 13:34:08 -0400
+Subject: [PATCH 1/1] udiskslinuxmanager: Add lower bounds check to fd_index
+
+Make sure fd_index isn't negative as this can lead to an OOB read
+resulting in a crash, or to exposing internal file descriptors.
+
+Reported by Michael Imfeld (born0monday).
+---
+ src/udiskslinuxmanager.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/udiskslinuxmanager.c b/src/udiskslinuxmanager.c
+index 4e633284..887771ee 100644
+--- a/src/udiskslinuxmanager.c
++++ b/src/udiskslinuxmanager.c
+@@ -381,7 +381,7 @@ handle_loop_setup (UDisksManager          *object,
+     goto out;
+ 
+   fd_num = g_variant_get_handle (fd_index);
+-  if (fd_list == NULL || fd_num >= g_unix_fd_list_get_length (fd_list))
++  if (fd_list == NULL || fd_num < 0 || fd_num >= g_unix_fd_list_get_length (fd_list))
+     {
+       g_dbus_method_invocation_return_error (invocation,
+                                              UDISKS_ERROR,
+-- 
+2.43.0
+
+

udisks2.spec

@@ -14,16 +14,26 @@
 %define git_hash                        %(git log -1 --pretty=format:"%h" || true)
 %define build_date                      %(date '+%Y%m%d')
 
+%define ol_btrfs_arches                x86_64 aarch64
+
 # btrfs is not available on RHEL
 %if 0%{?rhel}
 %define with_btrfs 0
 %endif
 
+# enable btrfs support for OL supported arches
+%if 0%{?oraclelinux}
+%ifarch %{ol_btrfs_arches}
+%define with_btrfs 1
+%else
+%define with_btrfs 0
+%endif
+%endif
 
 Name:    udisks2
 Summary: Disk Manager
 Version: 2.10.90
-Release: 5%{?dist}
+Release: 5.0.1%{?dist}.1
 License: GPL-2.0-or-later
 URL:     https://github.com/storaged-project/udisks
 Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
@@ -32,6 +42,8 @@ Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{v
 Patch0:  udisks-2.11.0-lvm2-unused_device_detection-try_harder.patch
 # https://issues.redhat.com/browse/RHEL-74012
 Patch1:  udisks-2.11.0-mdraid-inhibit-locks.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=2388623
+Patch2:	udisks-2.10.91-manager_loopsetup_fd_bounds.patch
 
 BuildRequires: make
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -339,6 +351,12 @@ fi
 %endif
 
 %changelog
+* Wed Sep 03 2025 Darren Archibald <darren.archibald@oracle.com> - 2.10.90-5.0.1.1
+- Enable btrfs support for OL supported arches [Orabug: 37464632]
+
+* Tue Sep 02 2025 Darren Archibald <darren.archibald@oracle.com> - 2.10.90-5.1
+- udisks: Out-of-bounds read in UDisks Daemon (CVE-2025-8067)
+
 * Fri Jan 24 2025 Tomas Bzatek <tbzatek@redhat.com> - 2.10.90-5
 - mdraid: Avoid acquiring system inhibit lock for external array operations (RHEL-74012)