Page MenuHomeFreeBSD

D61808.1795410008.diff
No OneTemporary

Authored By
Unknown
Size
1 KB
Referenced Files
None
Subscribers
None

D61808.1795410008.diff

diff --git a/sys/kern/kern_kexec.c b/sys/kern/kern_kexec.c
--- a/sys/kern/kern_kexec.c
+++ b/sys/kern/kern_kexec.c
@@ -53,6 +53,7 @@
#include <vm/vm_page.h>
#include <vm/vm_pagequeue.h>
#include <vm/vm_pager.h>
+#include <vm/vm_param.h>
#include <vm/vm_phys.h>
#include <vm/vm_radix.h>
@@ -171,7 +172,7 @@
vm_object_t new_segments = NULL;
uint8_t *buf;
int err = 0;
- int i;
+ int i, rv;
const size_t segsize = nseg * sizeof(struct kexec_segment);
vm_page_t *page_list = 0;
vm_size_t image_count, md_pages, page_count, tmpsize;
@@ -281,11 +282,15 @@
VM_OBJECT_WUNLOCK(new_segments);
/* Map the object to do the copies */
- err = vm_map_find(kernel_map, new_segments, 0, &segment_va,
+ rv = vm_map_find(kernel_map, new_segments, 0, &segment_va,
ptoa(page_count), 0, VMFS_ANY_SPACE,
VM_PROT_RW, VM_PROT_RW, MAP_PREFAULT);
- if (err != 0)
+ if (rv != KERN_SUCCESS) {
+ /* vm_map_find() may leave a stale address. */
+ segment_va = 0;
+ err = vm_mmap_to_errno(rv);
goto out;
+ }
buf = (void *)segment_va;
new_image_stage->map_addr = segment_va;
new_image_stage->map_size = ptoa(new_segments->size);

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 23, 5:00 AM (9 h, 20 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41891408
Default Alt Text
D61808.1795410008.diff (1 KB)

Event Timeline