Skip to contentSkip to conversation

Fix possible NULL ptr dereferences and memory leaks

PATCH RESEND Applied Mateusz Grzonka 2 participants 3 messages Jun 13, 2022 – Jun 14, 2022 MD RAID

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 Fix possible NULL ptr dereferences and memory leaks

In Assemble there was a NULL check for sra variable, which effectively didn't stop the execution in every case. That might have resulted in a NULL pointer dereference.

Also in super-ddf, mu variable was set to NULL for some condition, and then immidiately dereferenced.
Additionally some memory wasn't freed as well.

---
 Assemble.c  | 7 ++++++-
 super-ddf.c | 9 +++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)
Assemble.c +6 -1
index 704b8293..2bd7f087 100644
@@ -1984,7 +1984,12 @@ int assemble_container_content(struct supertype *st, int mdfd,
 	}
 
 	sra = sysfs_read(mdfd, NULL, GET_VERSION|GET_DEVS);
-	if (sra == NULL || strcmp(sra->text_version, content->text_version) != 0) {
+	if (sra == NULL) {
+		pr_err("Failed to read sysfs parameters\n");
+		return 1;
+	}
+
+	if (strcmp(sra->text_version, content->text_version) != 0) {
 		if (content->array.major_version == -1 &&
 		    content->array.minor_version == -2 &&
 		    c->readonly &&
super-ddf.c +7 -2
index 3f304cdc..a592c5d7 100644
@@ -5125,13 +5125,16 @@ static struct mdinfo *ddf_activate_spare(struct active_array *a,
 	 */
 	vc = find_vdcr(ddf, a->info.container_member, rv->disk.raid_disk,
 		       &n_bvd, &vcl);
-	if (vc == NULL)
+	if (vc == NULL) {
+		free(rv);
 		return NULL;
+	}
 
 	mu = xmalloc(sizeof(*mu));
 	if (posix_memalign(&mu->space, 512, sizeof(struct vcl)) != 0) {
 		free(mu);
-		mu = NULL;
+		free(rv);
+		return NULL;
 	}
 
 	mu->len = ddf->conf_rec_len * 512 * vcl->conf.sec_elmnt_count;
@@ -5161,6 +5164,8 @@ static struct mdinfo *ddf_activate_spare(struct active_array *a,
 			pr_err("BUG: can't find disk %d (%d/%d)\n",
 			       di->disk.raid_disk,
 			       di->disk.major, di->disk.minor);
+			free(mu);
+			free(rv);
 			return NULL;
 		}
 		vc->phys_refnum[i_prim] = ddf->phys->entries[dl->pdnum].refnum;
Signature · 1 line
2.26.2
Applied
#1 lore raw
Quoted 8 lines · Mateusz Grzonka

In Assemble there was a NULL check for sra variable, which effectively didn't stop the execution in every case. That might have resulted in a NULL pointer dereference.

Also in super-ddf, mu variable was set to NULL for some condition, and then immidiately dereferenced.
Additionally some memory wasn't freed as well.

Quoted 5 lines
---
 Assemble.c  | 7 ++++++-
 super-ddf.c | 9 +++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

Applied!

Thanks,
Jes

Applied
#2 lore raw
In reply to Mateusz Grzonka
Quoted 8 lines · Mateusz Grzonka

In Assemble there was a NULL check for sra variable, which effectively didn't stop the execution in every case. That might have resulted in a NULL pointer dereference.

Also in super-ddf, mu variable was set to NULL for some condition, and then immidiately dereferenced.
Additionally some memory wasn't freed as well.

Quoted 6 lines
---
 Assemble.c  | 7 ++++++-
 super-ddf.c | 9 +++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

Applied!

Thanks,
Jes