Skip to contentSkip to conversation

md/raid0: If md_integrity_register() failed,raid0_run() must free the mem.

PATCH Applied majianpeng 2 participants 2 messages Mar 23, 2012 – Mar 27, 2012 MD RAID

lore
Share & tools
lore

majianpeng

author
#0 lore raw

From 3d07b1d34ee2dcb1abd599a90855f1a5c30c3de6 Mon Sep 17 00:00:00 2001
From: majianpeng <[email protected]>
Date: Fri, 23 Mar 2012 10:04:57 +0800
Subject: [PATCH] md/raid0: If md_integrity_register() failed,raid0_run() must
free the mem.

Signed-off-by majianpeng <[email protected]>
---
 drivers/md/raid0.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
drivers/md/raid0.c +9 -1
index 6f31f55..5a99cde 100644
@@ -454,7 +454,15 @@ static int raid0_run(struct mddev *mddev)
 
 	blk_queue_merge_bvec(mddev->queue, raid0_mergeable_bvec);
 	dump_zones(mddev);
-	return md_integrity_register(mddev);
+
+	ret = md_integrity_register(mddev);
+	if (ret) {
+		kfree(conf->strip_zone);
+		kfree(conf->devlist);
+		kfree(conf);
+		mddev->private = NULL;
+	}
+	return ret;
 }
 
 static int raid0_stop(struct mddev *mddev)
Signature · 6 lines
1.7.5.4

 				
--------------
majianpeng
2012-03-23
Applied
#1 lore raw
Quoted 23 lines · On Fri, 23 Mar 2012 10:30:09 +0800 "majianpeng" <[email protected]> wrote:
Quoted 1 line

From 3d07b1d34ee2dcb1abd599a90855f1a5c30c3de6 Mon Sep 17 00:00:00 2001

From: majianpeng <[email protected]>
Date: Fri, 23 Mar 2012 10:04:57 +0800
Subject: [PATCH] md/raid0: If md_integrity_register() failed,raid0_run() must
free the mem.

Signed-off-by majianpeng <[email protected]>
---
 drivers/md/raid0.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
drivers/md/raid0.c +2 -1
index 6f31f55..5a99cde 100644
@@ -454,7 +454,15 @@ static int raid0_run(struct mddev *mddev)
 
 	blk_queue_merge_bvec(mddev->queue, raid0_mergeable_bvec);
 	dump_zones(mddev);
-	return md_integrity_register(mddev);
+
+	ret = md_integrity_register(mddev);

drivers/md/raid0.c static int raid0_run(struct mddev *mddev) · line 468

Quoted 10 lines
drivers/md/raid0.c +7 -0
+	if (ret) {
+		kfree(conf->strip_zone);
+		kfree(conf->devlist);
+		kfree(conf);
+		mddev->private = NULL;
+	}
+	return ret;
 }
 
 static int raid0_stop(struct mddev *mddev)

Applied, thanks,
however I changed it to just call "raid0_stop" instead of explicitly freeing things. This reduces code duplication.

Thanks,
NeilBrown