diff --git a/0036-Fix-null-pointer-for-incremental-in-mdadm.patch b/0036-Fix-null-pointer-for-incremental-in-mdadm.patch new file mode 100644 index 0000000000000000000000000000000000000000..ac0304941fb52722e54551c5bf53af3e8829324f --- /dev/null +++ b/0036-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: 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 a4ff7d4..0e626d8 100644 +--- a/Incremental.c ++++ b/Incremental.c +@@ -506,6 +506,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 55f3e1c5fc8c2799204bc02b95c0c11d00103a79..875f85f16490afc0662b9fe98f091e901430fe39 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,6 +1,6 @@ Name: mdadm Version: 4.1 -Release: 12 +Release: 13 Summary: The software RAID arrays user manage tools License: GPLv2+ URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/ @@ -45,6 +45,7 @@ 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 Patch35: 0035-Fix-race-of-mdadm-add-and-mdadm-incremental.patch +Patch36: 0036-Fix-null-pointer-for-incremental-in-mdadm.patch BuildRequires: systemd gcc binutils Requires(post): systemd coreutils @@ -110,6 +111,9 @@ install -d -m 710 %{buildroot}/var/run/mdadm/ %{_mandir}/man*/* %changelog +* Wed Jun 5 2024 zhangyaqi - 4.1-13 +- Fix null pointer for incremental in mdadm + * Thu Dec 14 2023 wuguanghao - 4.1-12 - Fix race of "mdadm --add" and "mdadm --incremental"