diff --git a/0034-Fix-null-pointer-for-incremental-in-mdadm.patch b/0034-Fix-null-pointer-for-incremental-in-mdadm.patch new file mode 100644 index 0000000000000000000000000000000000000000..be9047a02bd0c7389c30c8bece550fb3b0d44edb --- /dev/null +++ b/0034-Fix-null-pointer-for-incremental-in-mdadm.patch @@ -0,0 +1,43 @@ +From 890212d6800646153210ac264ce73035cc7dd5cc Mon Sep 17 00:00:00 2001 +From: miaoguanqin +Date: Tue, 4 Apr 2023 19:31:24 +0800 +Subject: [PATCH] Fix null pointer for incremental in mdadm + +when we excute mdadm --assemble, udev-md-raid-assembly.rules is triggered. +Then we stop array, we found an coredump for mdadm --incremental.func +stack are as follows: + +#0 enough (level=10, raid_disks=4, layout=258, clean=1, + avail=avail@entry=0x0) at util.c:555 +#1 0x0000562170c26965 in Incremental (devlist=, + c=, st=0x5621729b6dc0) at Incremental.c:514 +#2 0x0000562170bfb6ff in main (argc=, + argv=) at mdadm.c:1762 + +func enough() use array avail,avail allocate space in func count_active, +it may not alloc space, causing a coredump.We fix this coredump. + +Signed-off-by: Guanqin Miao +Signed-off-by: lixiaokeng +Signed-off-by: Jes Sorensen +--- + Incremental.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/Incremental.c b/Incremental.c +index 09b94b9f..49a71f72 100644 +--- a/Incremental.c ++++ b/Incremental.c +@@ -507,6 +507,9 @@ int Incremental(struct mddev_dev *devlist, struct context *c, + GET_OFFSET | GET_SIZE)); + active_disks = count_active(st, sra, mdfd, &avail, &info); + ++ if (!avail) ++ goto out_unlock; ++ + journal_device_missing = (info.journal_device_required) && (info.journal_clean == 0); + + if (info.consistency_policy == CONSISTENCY_POLICY_PPL) +-- +2.27.0 + diff --git a/mdadm.spec b/mdadm.spec index 86836fdd93de0f6aa9c85df24f71e4ffc133934a..5e3ae13d830b0cc6e18f62ca83452852335721b0 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,6 +1,6 @@ Name: mdadm Version: 4.1 -Release: 10 +Release: 11 Summary: The software RAID arrays user manage tools License: GPLv2+ URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/ @@ -43,6 +43,7 @@ Patch30: 0030-monitor-Avoid-segfault-when-calling-NULL-get_bad_blo.patch Patch31: 0031-fix-NULL-dereference-in-super_by_fd.patch Patch32: 0032-Fix-memory-leak-after-mdadm-detail.patch Patch33: 0033-mdadm-block-creation-with-long-names.patch +Patch34: 0034-Fix-null-pointer-for-incremental-in-mdadm.patch BuildRequires: systemd gcc binutils Requires(post): systemd coreutils @@ -108,6 +109,9 @@ install -d -m 710 %{buildroot}/var/run/mdadm/ %{_mandir}/man*/* %changelog +* Tue Sep 12 2023 miaoguanqin - 4.1-11 +- fix null pointer for incremental in mdadm + * Thu Sep 7 2023 miaoguanqin - 4.1-10 - fix CVE-2023-28736 and CVE-2023-28938 for mdadm