|
@@ -2482,7 +2482,7 @@ static unsigned long pvm_determine_end(struct vmap_area **pnext,
|
|
* matching slot. While scanning, if any of the areas overlaps with
|
|
* matching slot. While scanning, if any of the areas overlaps with
|
|
* existing vmap_area, the base address is pulled down to fit the
|
|
* existing vmap_area, the base address is pulled down to fit the
|
|
* area. Scanning is repeated till all the areas fit and then all
|
|
* area. Scanning is repeated till all the areas fit and then all
|
|
- * necessary data structres are inserted and the result is returned.
|
|
|
|
|
|
+ * necessary data structures are inserted and the result is returned.
|
|
*/
|
|
*/
|
|
struct vm_struct **pcpu_get_vm_areas(const unsigned long *offsets,
|
|
struct vm_struct **pcpu_get_vm_areas(const unsigned long *offsets,
|
|
const size_t *sizes, int nr_vms,
|
|
const size_t *sizes, int nr_vms,
|
|
@@ -2510,15 +2510,11 @@ struct vm_struct **pcpu_get_vm_areas(const unsigned long *offsets,
|
|
if (start > offsets[last_area])
|
|
if (start > offsets[last_area])
|
|
last_area = area;
|
|
last_area = area;
|
|
|
|
|
|
- for (area2 = 0; area2 < nr_vms; area2++) {
|
|
|
|
|
|
+ for (area2 = area + 1; area2 < nr_vms; area2++) {
|
|
unsigned long start2 = offsets[area2];
|
|
unsigned long start2 = offsets[area2];
|
|
unsigned long end2 = start2 + sizes[area2];
|
|
unsigned long end2 = start2 + sizes[area2];
|
|
|
|
|
|
- if (area2 == area)
|
|
|
|
- continue;
|
|
|
|
-
|
|
|
|
- BUG_ON(start2 >= start && start2 < end);
|
|
|
|
- BUG_ON(end2 <= end && end2 > start);
|
|
|
|
|
|
+ BUG_ON(start2 < end && start < end2);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
last_end = offsets[last_area] + sizes[last_area];
|
|
last_end = offsets[last_area] + sizes[last_area];
|