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

Correct an off-by-one error in vm_reserv_reclaim_contig() that results in

Browse Source 
an infinite loop.

Submitted by:	Svatopluk Kraus
MFC after:	1 week
This commit is contained in:
alc 2015-04-11 22:57:13 +00:00
parent 285a2b7b6d
commit f116ec9943
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/vm/vm_reserv.c
View File

@ -983,8 +983,18 @@ vm_reserv_reclaim_contig(u_long npages, vm_paddr_t low, vm_paddr_t high,
break;
} else if ((pa & (alignment - 1)) != 0 ||
((pa ^ (pa + size - 1)) & ~(boundary - 1)) != 0) {
/* Continue with this reservation. */
hi = lo;
/*
* The current page doesn't meet the alignment
* and/or boundary requirements. Continue
* searching this reservation until the rest
* of its free pages are either excluded or
* exhausted.
*/
hi = lo + 1;
if (hi >= NBPOPMAP) {
hi = 0;
i++;
}
continue;
}
/* Find the next used page. */