From bd9fb13fa11bd4b1e98ea4fafb86491eb0ca1734 Mon Sep 17 00:00:00 2001 From: cenhuilin Date: Tue, 2 Sep 2025 15:08:31 +0800 Subject: [PATCH] lsblk: use md as fallback TYPE when md/level empty --- ...as-fallback-TYPE-when-md-level-empty.patch | 25 +++++++++++++++++++ util-linux.spec | 9 ++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 backport-lsblk-use-md-as-fallback-TYPE-when-md-level-empty.patch diff --git a/backport-lsblk-use-md-as-fallback-TYPE-when-md-level-empty.patch b/backport-lsblk-use-md-as-fallback-TYPE-when-md-level-empty.patch new file mode 100644 index 0000000..f07e49b --- /dev/null +++ b/backport-lsblk-use-md-as-fallback-TYPE-when-md-level-empty.patch @@ -0,0 +1,25 @@ +From 6bed45b965b22c8ea5c10c43320c19cf84fd8cfa Mon Sep 17 00:00:00 2001 +From: codefiles <11915375+codefiles@users.noreply.github.com> +Date: Tue, 2 Sep 2025 14:57:34 +0800 +Subject: [PATCH] lsblk: use md as fallback TYPE when md/level empty + +--- + misc-utils/lsblk.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c +index 15d9b19..c3b97d9 100644 +--- a/misc-utils/lsblk.c ++++ b/misc-utils/lsblk.c +@@ -482,7 +482,7 @@ static char *get_type(struct lsblk_device *dev) + char *md_level = NULL; + + ul_path_read_string(dev->sysfs, &md_level, "md/level"); +- res = md_level ? md_level : xstrdup("md"); ++ res = (md_level && *md_level) ? md_level : xstrdup("md"); + + } else { + const char *type = NULL; +-- +2.43.0 + diff --git a/util-linux.spec b/util-linux.spec index cece837..b91462d 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -3,7 +3,7 @@ Name: util-linux Version: 2.40.4 -Release: 9 +Release: 10 Summary: A random collection of Linux utilities License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain URL: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git @@ -42,6 +42,7 @@ Patch6020: backport-cfdisk-fix-memory-leak-and-possible-NULL-dereference.pa Patch6021: backport-swapoff-clean-up-tag-resolution.patch Patch6022: backport-libblkid-befs-fix-underflow.patch Patch6023: backport-revert-libblkid-ext-add-checksum-support.patch +Patch6024: backport-lsblk-use-md-as-fallback-TYPE-when-md-level-empty.patch Patch9000: SKIPPED-no-root-permissions-test.patch Patch9001: util-linux-Add-sw64-architecture.patch @@ -409,6 +410,12 @@ fi %endif %changelog +* Tue Sep 02 2025 cenhuilin - 2.40.4-10 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:lsblk: use md as fallback TYPE when md/level empty + * Fri Aug 01 2025 zhangyao - 2.40.4-9 - Type:bugfix - CVE:NA -- Gitee