diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-15 11:34:20 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-15 11:34:20 -0700 |
| commit | 709743c554c78b4bbc4483a3ba6845909d4db6ba (patch) | |
| tree | a20181a0c559a97784269d63538c8b41ce0638a6 | |
| parent | 7cbeb80e900d2cbb47c6de75826769b5addb4867 (diff) | |
| download | mdadm-709743c554c78b4bbc4483a3ba6845909d4db6ba.tar.gz | |
imsm: fix spare promotion
1/ Fix an off by one error when detecting whether the device allocation
loop succeeded or not
2/ Update ->num_raid_devs before copying to avoid a segmentation fault
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
| -rw-r--r-- | super-intel.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/super-intel.c b/super-intel.c index 782519e..4e2b75f 100644 --- a/super-intel.c +++ b/super-intel.c @@ -1499,18 +1499,17 @@ static int compare_super_imsm(struct supertype *st, struct supertype *tst) dv->next = first->devlist; first->devlist = dv; } - if (i <= sec->anchor->num_raid_devs) { + if (i < sec->anchor->num_raid_devs) { /* allocation failure */ free_devlist(first); fprintf(stderr, "imsm: failed to associate spare\n"); return 3; } - for (i = 0; i < sec->anchor->num_raid_devs; i++) - imsm_copy_dev(get_imsm_dev(first, i), get_imsm_dev(sec, i)); - first->anchor->num_raid_devs = sec->anchor->num_raid_devs; first->anchor->orig_family_num = sec->anchor->orig_family_num; first->anchor->family_num = sec->anchor->family_num; + for (i = 0; i < sec->anchor->num_raid_devs; i++) + imsm_copy_dev(get_imsm_dev(first, i), get_imsm_dev(sec, i)); } return 0; |