diff --git a/udisks-2.10.91-manager_loopsetup_fd_bounds.patch b/udisks-2.10.91-manager_loopsetup_fd_bounds.patch new file mode 100644 index 0000000000000000000000000000000000000000..f659e0537c1ac634c220526fdfa531df73411cc4 --- /dev/null +++ b/udisks-2.10.91-manager_loopsetup_fd_bounds.patch @@ -0,0 +1,29 @@ +From 55e36ef2af4fbfc92aab5cef50a69123e321f9f1 Mon Sep 17 00:00:00 2001 +From: Marc Deslauriers +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 + diff --git a/udisks2.spec b/udisks2.spec index 7dd183e870e228af1e4d7523d4d1003f804b86bb..de27d2a1724e11456072d2eaa42c61bf70f124a7 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -1,7 +1,8 @@ -%define anolis_release 2 +ExclusiveArch: x86_64 aarch64 +%define anolis_release 7 Name: udisks2 -Version: 2.10.90 +Version: 2.10.91 Release: %{anolis_release}%{?dist} Summary: Disk Manager @@ -9,9 +10,9 @@ License: GPLv2+ URL: https://github.com/storaged-project/udisks Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2 -Patch1: udisks-2.11.0-lvm2-unused_device_detection-try_harder.patch -Patch2: udisks-2.11.0-mdraid-inhibit-locks.patch -Patch3: udisks-2.11.0-udiskslinuxfilesystemhelpers-Mount_private_mounts_with_nodev_nosuid.patch +Patch0: udisks-2.11.0-lvm2-unused_device_detection-try_harder.patch +Patch1: udisks-2.11.0-mdraid-inhibit-locks.patch +Patch2: udisks-2.10.91-manager_loopsetup_fd_bounds.patch BuildRequires: libtool BuildRequires: automake @@ -139,12 +140,16 @@ This package contains module for LSM configuration. %prep %autosetup -n udisks-%{version} -p1 -sed -i udisks/udisks2.conf.in -e "s/encryption=luks1/encryption=luks2/" +rm -f src/tests/dbus-tests/config_h.py +rm -f src/udisks-daemon-resources.{c,h} +# default to ntfs-3g (#2182206) +sed -i data/builtin_mount_options.conf -e 's/ntfs_drivers=ntfs3,ntfs/ntfs_drivers=ntfs,ntfs3/' %build autoreconf -ivf %configure \ --enable-gtk-doc \ + --enable-smart \ --enable-lsm \ --enable-lvm2 \ --enable-iscsi @@ -161,8 +166,6 @@ chrpath --delete %{buildroot}/%{_libexecdir}/udisks2/udisksd %find_lang udisks2 -%generate_compatibility_deps - %post %systemd_post udisks2.service # only trigger when udev is accessible @@ -237,6 +240,11 @@ fi %attr(0600,root,root) %{_sysconfdir}/udisks2/modules.conf.d/udisks2_lsm.conf %changelog +* Thu Feb 13 2026 wency_cn - 2.10.90-6 +- Update to upstream release 2.10.90-6 +- Add security patch for CVE-2025-8067 +- Include all upstream patches and improvements + * Fri Jun 20 2025 Shile Zhang - 2.10.90-2 - Fix CVE-2025-6019 @@ -247,22 +255,3 @@ fi - mdraid: Avoid acquiring system inhibit lock for external array operations [Patches cherry-pick from c10s. Original changelog: - mdraid: Avoid acquiring system inhibit lock for external array operations. ( 2.10.90-5 )] - -* Tue Feb 14 2023 Ziyang Zhang - 2.9.4-6 -- Add latests patches fixing Fix GError ownership -- Add missing libtool build requirement - -* Wed Nov 02 2022 mgb01105731 - 2.9.4-5 -- optimise spec file - -* Mon Oct 24 2022 Chunmei Xu - 2.9.4-4 -- fix coredump while stop udisks2 - -* Fri Sep 30 2022 mgb01105731 - 2.9.4-3 -- add doc package - -* Thu Mar 17 2022 Su Lifan - 2.9.4-2 -- Fix default LUKS version - -* Fri Mar 11 2022 Su Lifan - 2.9.4-1 -- Initial packaging for Anolis OS 23