From 0eda0dac2fdffeed812ddcfc882b613e0206eff3 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 13 Mar 2023 14:58:08 +0100 Subject: Merging upstream version 4.2+20230304. Signed-off-by: Daniel Baumann --- super-ddf.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'super-ddf.c') 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; } -- cgit v1.2.3