When VM_MAP_WIRE_HOLESOK is not specified and vm_map_wire(9) encounters

non-readable and non-executable map entry, the entry is skipped from
wiring and loop is aborted. But, since MAP_ENTRY_WIRE_SKIPPED was not
set for the map entry, its wired_count is later erronously decremented.
vm_map_delete(9) for such map entry stuck in "vmmaps".

Properly set MAP_ENTRY_WIRE_SKIPPED when aborting the loop.

Reported by:	John Marshall <john.marshall riverwillow com au>
Approved by:	re (kensmith)
This commit is contained in:
kib 2009-07-12 12:37:38 +00:00
parent e13a0a527a
commit 871f788d79

View File

@ -2354,12 +2354,12 @@ vm_map_wire(vm_map_t map, vm_offset_t start, vm_offset_t end,
if (entry->wired_count == 0) {
if ((entry->protection & (VM_PROT_READ|VM_PROT_EXECUTE))
== 0) {
entry->eflags |= MAP_ENTRY_WIRE_SKIPPED;
if ((flags & VM_MAP_WIRE_HOLESOK) == 0) {
end = entry->end;
rv = KERN_INVALID_ADDRESS;
goto done;
}
entry->eflags |= MAP_ENTRY_WIRE_SKIPPED;
goto next_entry;
}
entry->wired_count++;