diff options
| author | Justus Winter <justus@gnupg.org> | 2016-10-21 17:23:06 +0200 |
|---|---|---|
| committer | Justus Winter <justus@gnupg.org> | 2016-10-21 17:59:18 +0200 |
| commit | 260d0254d3dd8b2cb0b062a255f1c4201566b5a8 (patch) | |
| tree | 7f3938e2d64be26e9b86badc08571d7ea2b826bd | |
| parent | 834a883acdbdfa3fc93a9b635d20f4d636a1be41 (diff) | |
Gracefully handle pmap allocation failures.
* kern/task.c (task_create): Gracefully handle pmap allocation
failures.
* vm/vm_map.c (vm_map_fork): Likewise.
| -rw-r--r-- | kern/task.c | 17 | ||||
| -rw-r--r-- | vm/vm_map.c | 3 |
2 files changed, 17 insertions, 3 deletions
diff --git a/kern/task.c b/kern/task.c index 7dff1249..1874af69 100644 --- a/kern/task.c +++ b/kern/task.c @@ -100,13 +100,24 @@ kern_return_t task_create( new_task->map = kernel_map; } else if (inherit_memory) { new_task->map = vm_map_fork(parent_task->map); - vm_map_set_name(new_task->map, new_task->name); } else { - new_task->map = vm_map_create(pmap_create(0), + pmap_t new_pmap = pmap_create((vm_size_t) 0); + if (new_pmap == PMAP_NULL) + new_task->map = VM_MAP_NULL; + else { + new_task->map = vm_map_create(new_pmap, round_page(VM_MIN_ADDRESS), trunc_page(VM_MAX_ADDRESS)); - vm_map_set_name(new_task->map, new_task->name); + if (new_task->map == VM_MAP_NULL) + pmap_destroy(new_pmap); + } } + if (new_task->map == VM_MAP_NULL) { + kmem_cache_free(&task_cache, (vm_address_t) new_task); + return KERN_RESOURCE_SHORTAGE; + } + if (child_task != &kernel_task) + vm_map_set_name(new_task->map, new_task->name); simple_lock_init(&new_task->lock); queue_init(&new_task->thread_list); diff --git a/vm/vm_map.c b/vm/vm_map.c index 249d18a4..b8a3ade7 100644 --- a/vm/vm_map.c +++ b/vm/vm_map.c @@ -4127,6 +4127,9 @@ vm_map_t vm_map_fork(vm_map_t old_map) vm_size_t entry_size; vm_object_t object; + if (new_pmap == PMAP_NULL) + return VM_MAP_NULL; + vm_map_lock(old_map); new_map = vm_map_create(new_pmap, |