d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Catch a corner case where ssegs could be 0 and thus i would be 0 and

Browse Source 
we index suinfo out of bounds (i.e. -1).

Approved by:	gber
This commit is contained in:
Marcel Moolenaar 2012-05-28 16:33:58 +00:00
parent 54ca36aeac
commit e9b29d1604
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/fs/nandfs/nandfs_cleaner.c
View File

@ -310,23 +310,22 @@ nandfs_cleaner_choose_segment(struct nandfs_device *fsdev, uint64_t **segpp,
nandfs_error("%s:%d", __FILE__, __LINE__);
goto out;
}
if (ssegs == 0 && *rseg != 0) {
*rseg = 0;
goto retry;
}
if (ssegs > 0) {
print_suinfo(suinfo, ssegs);
print_suinfo(suinfo, ssegs);
for (i = 0; i < ssegs; i++) {
(**segpp) = suinfo[i].nsi_num;
(*segpp)++;
for (i = 0; i < ssegs; i++) {
(**segpp) = suinfo[i].nsi_num;
(*segpp)++;
}
*rseg = suinfo[i - 1].nsi_num + 1;
}
*rseg = suinfo[i - 1].nsi_num + 1;
out:
free(suinfo, M_NANDFSTEMP);
return (error);
}