Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

DDF: more guards against pdnum being negative. 

With consistent metdata, pdnum should never be negative,
but it is better to be safe than sorry.

Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
NeilBrown 2014-04-09 16:35:18 +10:00
parent 4e0eb0dbbd
commit 41bcbc14c4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
super-ddf.c
View File

@ -2059,7 +2059,7 @@ static void getinfo_super_ddf_bvd(struct supertype *st, struct mdinfo *info, cha
info->disk.major = 0;
info->disk.minor = 0;
info->disk.state = 0;
if (dl) {
if (dl && dl->pdnum >= 0) {
info->disk.major = dl->major;
info->disk.minor = dl->minor;
info->disk.raid_disk = cd + conf->sec_elmnt_seq
@ -2671,7 +2671,7 @@ static void add_to_super_ddf_bvd(struct supertype *st,
dl->minor == dk->minor)
break;
}
if (!dl || ! (dk->state & (1<<MD_DISK_SYNC)))
if (!dl || dl->pdnum < 0 || ! (dk->state & (1<<MD_DISK_SYNC)))
return;
vc = &ddf->currentconf->conf;
@ -4030,7 +4030,7 @@ static int compare_super_ddf(struct supertype *st, struct supertype *tst)
if (be32_eq(first->phys->entries[pd].refnum,
dl1->disk.refnum))
break;
dl1->pdnum = pd;
dl1->pdnum = pd < max_pds ? (int)pd : -1;
if (dl2->spare) {
if (posix_memalign((void **)&dl1->spare, 512,
first->conf_rec_len*512) != 0) {