From e332f62b991e64adb840bb6d4adec8c2e9483b9f Mon Sep 17 00:00:00 2001 From: Hailiang Date: Tue, 14 Oct 2025 10:21:14 +0800 Subject: [PATCH] udisksbasejob: Keep the original data when adding object path --- ...ep-the-original-data-when-adding-obj.patch | 27 +++++++++++++++++++ udisks2.spec | 6 ++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 0007-udisksbasejob-Keep-the-original-data-when-adding-obj.patch diff --git a/0007-udisksbasejob-Keep-the-original-data-when-adding-obj.patch b/0007-udisksbasejob-Keep-the-original-data-when-adding-obj.patch new file mode 100644 index 0000000..c117a19 --- /dev/null +++ b/0007-udisksbasejob-Keep-the-original-data-when-adding-obj.patch @@ -0,0 +1,27 @@ +From c98e4c2cbfc3db8bd095a2aa4d8b2e22981a6139 Mon Sep 17 00:00:00 2001 +From: wangrong +Date: Mon, 4 Aug 2025 17:32:46 +0800 +Subject: [PATCH] udisksbasejob: Keep the original data when adding object path + +--- + src/udisksbasejob.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/udisksbasejob.c b/src/udisksbasejob.c +index 71038ec9..6d133140 100644 +--- a/src/udisksbasejob.c ++++ b/src/udisksbasejob.c +@@ -302,6 +302,10 @@ udisks_base_job_add_object (UDisksBaseJob *job, + } + + p = g_new0 (const gchar *, n + 2); ++ for (n = 0; paths != NULL && paths[n] != NULL; n++) ++ { ++ p[n] = paths[n]; ++ } + p[n] = object_path; + udisks_job_set_objects (UDISKS_JOB (job), p); + g_free (p); +-- +2.20.1 + diff --git a/udisks2.spec b/udisks2.spec index 0ff38e7..1f5478b 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -19,7 +19,7 @@ Name: udisks2 Summary: Disk Manager Version: 2.10.1 -Release: 7 +Release: 8 License: GPL-2.0+ and LGPL-2.0+ Group: System Environment/Libraries URL: https://github.com/storaged-project/udisks @@ -31,6 +31,7 @@ Patch0003: 0003-udiskslinuxblock-Fix-leaking-string.patch Patch0004: 0004-fix-CVE-2025-6019-udiskslinuxfilesystemhelpers-mount-with-nosuid-nodev.patch Patch0005: 0005-helpers-fixed-memleak-and-misprint-check-for-creating-second-BDCrypto-context.patch Patch0006: 0006-CVE-2025-8067.patch +Patch0007: 0007-udisksbasejob-Keep-the-original-data-when-adding-obj.patch BuildRequires: make BuildRequires: glib2-devel >= %{glib2_version} @@ -321,6 +322,9 @@ fi %changelog +* Tue Oct 14 2025 mahailiang - 2.10.1-8 +- udisksbasejob: Keep the original data when adding object path + * Wed Sep 03 2025 wangmian - 2.10.1-7 - fix CVE-2025-8067 -- Gitee