SOURCES/0006-dont-allow-suid-and-dev-set-on-fs-resize.patch

@@ -1,18 +1,18 @@
-From 2508f4842482b87d26f81afecc7d0b584d6a6fa8 Mon Sep 17 00:00:00 2001
+From 8e072f794744bd17c57cceabb3884d3f0f6a1602 Mon Sep 17 00:00:00 2001
 From: Thomas Blume <Thomas.Blume@suse.com>
 Date: Fri, 16 May 2025 14:27:10 +0200
-Subject: [PATCH] Don't allow suid and dev set on fs resize
+Subject: [PATCH] dont allow suid and dev set on fs resize
 
-Fixes: CVE-2025-6019
+[Salvatore Bonaccorso: Backport to 2.28, which does not contain 2b55f566d422
+("fs: Add support for NILFS2 filesystem") from 3.0 which generalized the
+bd_fs_mount() call in preparation for other filesystems.]
 ---
- src/plugins/fs/generic.c | 2 +-
+ src/plugins/fs/generic.c | 4 +++-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 
-diff --git a/src/plugins/fs/generic.c b/src/plugins/fs/generic.c
-index ca08d19a..15b55271 100644
 --- a/src/plugins/fs/generic.c
 +++ b/src/plugins/fs/generic.c
-@@ -409,7 +409,7 @@ static gboolean xfs_resize_device (const gchar *device, guint64 new_size, const
+@@ -409,7 +409,7 @@ static gboolean xfs_resize_device (const
                               "before resizing it.", device);
                  return FALSE;
              }
@@ -21,6 +21,4 @@ index ca08d19a..15b55271 100644
              if (!ret) {
                  g_prefix_error (error, "Failed to mount '%s' before resizing it: ", device);
                  return FALSE;
--- 
-2.49.0
 

SPECS/libblockdev.spec

@@ -125,7 +125,7 @@
 
 Name:        libblockdev
 Version:     2.28
-Release:     7%{?dist}
+Release:     6%{?dist}.alma.1
 Summary:     A library for low-level manipulation with block devices
 License:     LGPLv2+
 URL:         https://github.com/storaged-project/libblockdev
@@ -135,7 +135,7 @@ Patch1:      0002-tests-Fix-test_swapon_pagesize-on-systems-with-64k-p.patch
 Patch2:      0003-part-Fix-segfault-when-adding-a-partition-too-big-fo.patch
 Patch3:      0004-lvm-Add-a-function-to-activate-LVs-in-shared-mode.patch
 Patch4:      0005-lvm-Add-support-for-starting-and-stopping-VG-locking.patch
-Patch5:      0006-Don-t-allow-suid-and-dev-set-on-fs-resize.patch
+Patch5:      0006-dont-allow-suid-and-dev-set-on-fs-resize.patch
 
 BuildRequires: make
 BuildRequires: glib2-devel
@@ -992,11 +992,10 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm}
 %files plugins-all
 
 %changelog
-* Mon Jun 16 2025 Vojtech Trefny <vtrefny@redhat.com> - 2.28-7
+* Wed Jun 18 2025 Jonathan Wright <jonathan@almalinux.org - 2.28-10.alma.1
-- Don't allow suid and dev set on fs resize (CVE-2025-6019)
+- Fix CVE-2025-2019 don't allow suid and dev set on fs resize
-  Resolves: RHEL-96034
 
-* Wed Nov 08 2023 Vojtech Trefny <vtrefny@redhat.com> - 2.28-6
+* Wed Nov 08 2023 Vojtech Trefny <vtrefny@redhat.com> - 2.28-10
 - lvm: Add support for starting and stopping VG locking
   Resolves: RHEL-15923