AlmaLinux changes: Enable Btrfs support
This commit is contained in:
root
commit
787692e62f
1
.gitignore
vendored
1
.gitignore
vendored
@ -21,3 +21,4 @@
|
||||
/udisks-2.10.1.tar.bz2
|
||||
/udisks-2.10.90.gitdb54112e.tar.bz2
|
||||
/udisks-2.10.90.tar.bz2
|
||||
/udisks-2.11.0.tar.bz2
|
||||
|
||||
@ -1,2 +0,0 @@
|
||||
---
|
||||
xversion: '2.10.90'
|
||||
@ -1,6 +1,4 @@
|
||||
summary: udisks2 gating tests
|
||||
environment-file:
|
||||
- plans/env.yaml
|
||||
|
||||
prepare:
|
||||
how: install
|
||||
@ -29,8 +27,6 @@ prepare:
|
||||
|
||||
discover:
|
||||
how: shell
|
||||
url: https://gitlab.com/redhat/centos-stream/rpms/udisks2.git
|
||||
ref: c10s
|
||||
dist-git-source: true
|
||||
dist-git-install-builddeps: true
|
||||
tests:
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (udisks-2.10.90.tar.bz2) = 7e2507ee9b235925af6d367a0d55608f7a2780a07efba9db3c4bc06a3d42728ce74fc9edc42255fc9259aa3426c83eb164e1e99740a2d2c1b80ec2265b51df90
|
||||
SHA512 (udisks-2.11.0.tar.bz2) = ddf7bbf6d71c100ea2787aa45d51ae84d8184d33d9e0c1c8824e3da1ca34814b3278f9f74a1aab7acc37efe3ed2b702404fbb9dc3733c0accbb366a74e7d3fe5
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
From d747e73aaec2c4e2cf124646230159e8b45a5da8 Mon Sep 17 00:00:00 2001
|
||||
From: Tomas Bzatek <tbzatek@redhat.com>
|
||||
Date: Tue, 5 Nov 2024 17:01:00 +0100
|
||||
Subject: [PATCH] lvm2: Try opening for unused device detection harder
|
||||
|
||||
Though the voluntary BSD locks cannot be used here due to opening
|
||||
O_EXCL already, let's make several attempts before bailing out.
|
||||
---
|
||||
modules/lvm2/udiskslvm2daemonutil.c | 9 ++++++++-
|
||||
1 file changed, 8 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/modules/lvm2/udiskslvm2daemonutil.c b/modules/lvm2/udiskslvm2daemonutil.c
|
||||
index b2131f9ca..32736d20f 100644
|
||||
--- a/modules/lvm2/udiskslvm2daemonutil.c
|
||||
+++ b/modules/lvm2/udiskslvm2daemonutil.c
|
||||
@@ -65,9 +65,16 @@ udisks_daemon_util_lvm2_block_is_unused (UDisksBlock *block,
|
||||
{
|
||||
const gchar *device_file;
|
||||
int fd;
|
||||
+ gint num_tries = 0;
|
||||
|
||||
device_file = udisks_block_get_device (block);
|
||||
- fd = open (device_file, O_RDONLY | O_EXCL);
|
||||
+
|
||||
+ while ((fd = open (device_file, O_RDONLY | O_EXCL)) < 0)
|
||||
+ {
|
||||
+ g_usleep (100 * 1000); /* microseconds */
|
||||
+ if (num_tries++ > 10)
|
||||
+ break;
|
||||
+ }
|
||||
if (fd < 0)
|
||||
{
|
||||
g_set_error (error, UDISKS_ERROR, UDISKS_ERROR_FAILED,
|
||||
File diff suppressed because it is too large
Load Diff
20
udisks2.spec
20
udisks2.spec
@ -4,7 +4,7 @@
|
||||
%global systemd_version 208
|
||||
%global dbus_version 1.4.0
|
||||
%global with_gtk_doc 1
|
||||
%global libblockdev_version 3.2
|
||||
%global libblockdev_version 3.4
|
||||
|
||||
%define with_btrfs 1
|
||||
%define with_lsm 1
|
||||
@ -27,19 +27,12 @@
|
||||
|
||||
Name: udisks2
|
||||
Summary: Disk Manager
|
||||
Version: 2.10.90
|
||||
Release: 6%{?dist}.alma.1
|
||||
Version: 2.11.0
|
||||
Release: 1%{?dist}.alma.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
|
||||
|
||||
# https://issues.redhat.com/browse/RHEL-39935
|
||||
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://issues.redhat.com/browse/RHEL-109406
|
||||
Patch2: udisks-2.10.91-manager_loopsetup_fd_bounds.patch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: glib2-devel >= %{glib2_version}
|
||||
BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
|
||||
@ -346,9 +339,14 @@ fi
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Sep 04 2025 Neal Gompa <ngompa@almalinux.org> - 2.10.90-6.alma.1
|
||||
* Sat Nov 08 2025 Neal Gompa <ngompa@almalinux.org> - 2.11.0-1.alma.1
|
||||
- AlmaLinux changes: Enable Btrfs support
|
||||
|
||||
* Thu Nov 06 2025 Tomas Bzatek <tbzatek@redhat.com> - 2.11.0-1
|
||||
- Version 2.11.0 (RHEL-114981)
|
||||
- tests: Rework nvme revision check (RHEL-90572)
|
||||
- tests: Adapt for missing fstab and crypttab (RHEL-78987)
|
||||
|
||||
* Tue Sep 02 2025 Tomas Bzatek <tbzatek@redhat.com> - 2.10.90-6
|
||||
- udiskslinuxmanager: Add lower bounds check to fd_index (CVE-2025-8067) (RHEL-109406)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user