diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-03-13 13:58:08 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-03-13 13:58:08 +0000 |
commit | 0eda0dac2fdffeed812ddcfc882b613e0206eff3 (patch) | |
tree | 3fedf03f6aeb94d52954f0310bca3d49362c49f2 /super-ddf.c | |
parent | Releasing debian version 4.2+20230302-1. (diff) | |
download | mdadm-0eda0dac2fdffeed812ddcfc882b613e0206eff3.tar.xz mdadm-0eda0dac2fdffeed812ddcfc882b613e0206eff3.zip |
Merging upstream version 4.2+20230304.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'super-ddf.c')
-rw-r--r-- | super-ddf.c | 9 |
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; } |