forked from pool/mdadm
90d4e6869d
- Update mdadm to latest upstream state upto commit
582945c2d3bb. (jsc#PED-7542)
1) The testing changes are not included here.
2) Code clean up, and more helper routines added for Manage.c,
Monitor.c, mdadm.c, ReadMe.c, super-intel.c, super0.c, super1.c,
Create.c, Incremental.c and so on.
3) Man page update for mdadm.8.in.
4) Several memory leak and double free fixes.
5) Check /etc/initrd-release for whether systemd running on an initrd.
- Manage: Block unsafe member failing
0062-Manage-Block-unsafe-member-failing.patch
- Mdmonitor: Split alert() into separate functions
0063-Mdmonitor-Split-alert-into-separate-functions.patch
- Monitor: block if monitor modes are combined.
0064-Monitor-block-if-monitor-modes-are-combined.patch
- Update mdadm Monitor manual.
0065-Update-mdadm-Monitor-manual.patch
- mdadm: create ident_init()
0066-mdadm-create-ident_init.patch
- mdadm: Add option validation for --update-subarray
0067-mdadm-Add-option-validation-for-update-subarray.patch
- Fix --update-subarray on active volume
0068-Fix-update-subarray-on-active-volume.patch
- Add code specific update options to enum.
0069-Add-code-specific-update-options-to-enum.patch
- super-ddf: Remove update_super_ddf.
0070-super-ddf-Remove-update_super_ddf.patch
- super0: refactor the code for enum
0071-super0-refactor-the-code-for-enum.patch
- super1: refactor the code for enum
OBS-URL: https://build.opensuse.org/request/show/1137473
OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=231
47 lines
1.4 KiB
Diff
47 lines
1.4 KiB
Diff
From 68b90794adf8287fa534cc8f35efb09772b133d0 Mon Sep 17 00:00:00 2001
|
|
From: Wu Guanghao <wuguanghao3@huawei.com>
|
|
Date: Sat, 4 Mar 2023 00:21:35 +0800
|
|
Subject: [PATCH] super-ddf.c: fix memleak in get_vd_num_of_subarray()
|
|
|
|
sra = sysfs_read() should be free before return in
|
|
get_vd_num_of_subarray()
|
|
|
|
Signed-off-by: Wu Guanghao <wuguanghao3@huawei.com>
|
|
Acked-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
|
|
Acked-by: Coly Li <colyli@suse.de>
|
|
Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
|
|
---
|
|
super-ddf.c | 9 +++++++--
|
|
1 file changed, 7 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/super-ddf.c b/super-ddf.c
|
|
index 309812d..b86c6ac 100644
|
|
--- a/super-ddf.c
|
|
+++ b/super-ddf.c
|
|
@@ -1592,15 +1592,20 @@ static unsigned int get_vd_num_of_subarray(struct supertype *st)
|
|
sra = sysfs_read(-1, st->devnm, GET_VERSION);
|
|
if (!sra || sra->array.major_version != -1 ||
|
|
sra->array.minor_version != -2 ||
|
|
- !is_subarray(sra->text_version))
|
|
+ !is_subarray(sra->text_version)) {
|
|
+ if (sra)
|
|
+ sysfs_free(sra);
|
|
return DDF_NOTFOUND;
|
|
+ }
|
|
|
|
sub = strchr(sra->text_version + 1, '/');
|
|
if (sub != NULL)
|
|
vcnum = strtoul(sub + 1, &end, 10);
|
|
if (sub == NULL || *sub == '\0' || *end != '\0' ||
|
|
- vcnum >= be16_to_cpu(ddf->active->max_vd_entries))
|
|
+ vcnum >= be16_to_cpu(ddf->active->max_vd_entries)) {
|
|
+ sysfs_free(sra);
|
|
return DDF_NOTFOUND;
|
|
+ }
|
|
|
|
return vcnum;
|
|
}
|
|
--
|
|
2.35.3
|
|
|