Re: 2.5.70-mm2

[Andrew Morton]

"John Stoffel" <[e-mail]> wrote:
>
> 
> Does 2.5.70-mm2 include the RAID1 patch posted by Niel?

No.  It seems that it didn't work right.

Zwane had a different fix, but afaik nobody has tried it out.  Apart from
Zwane of course.  And that was against raid0.

Zwane's RAID0 patch

diff -puN drivers/md/raid0.c~zwane-raid-double-free-fix drivers/md/raid0.c
--- 25/drivers/md/raid0.c~zwane-raid-double-free-fix	Thu May 29 14:32:02 2003
+++ 25-akpm/drivers/md/raid0.c	Thu May 29 14:32:02 2003
@@ -85,10 +85,8 @@ static int create_strip_zones (mddev_t *
 	conf->devlist = kmalloc(sizeof(mdk_rdev_t*)*
 				conf->nr_strip_zones*mddev->raid_disks,
 				GFP_KERNEL);
-	if (!conf->devlist) {
-		kfree(conf);
+	if (!conf->devlist)
 		return 1;
-	}
 
 	memset(conf->strip_zone, 0,sizeof(struct strip_zone)*
 				   conf->nr_strip_zones);
@@ -194,7 +192,6 @@ static int create_strip_zones (mddev_t *
 	return 0;
  abort:
 	kfree(conf->devlist);
-	kfree(conf->strip_zone);
 	return 1;
 }
 

Neil's RAID1 patch

diff -puN drivers/md/raid1.c~neilb-raid1-double-free-fix drivers/md/raid1.c
--- 25/drivers/md/raid1.c~neilb-raid1-double-free-fix	Thu May 29 14:34:23 2003
+++ 25-akpm/drivers/md/raid1.c	Thu May 29 14:34:23 2003
@@ -137,7 +137,7 @@ static void put_all_bios(conf_t *conf, r
 			BUG();
 		bio_put(r1_bio->read_bio);
 		r1_bio->read_bio = NULL;
-	}
+	} else
 	for (i = 0; i < conf->raid_disks; i++) {
 		struct bio **bio = r1_bio->write_bios + i;
 		if (*bio) {