summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWu Guanghao <wuguanghao3@huawei.com>2023-03-04 00:21:35 +0800
committerJes Sorensen <jes@trained-monkey.org>2023-03-08 13:54:30 -0500
commit68b90794adf8287fa534cc8f35efb09772b133d0 (patch)
treea98587c13cb6139ac2335756d2d50a997206eaec
parent5d2434d18b6bc71bd16678b1a6d1cc3a92f1d415 (diff)
downloadmdadm-68b90794adf8287fa534cc8f35efb09772b133d0.tar.gz
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>
-rw-r--r--super-ddf.c9
1 files 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;
}