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

Clean up some nits in link_elf_(un)load_file().

Browse Source 
- Remove a redundant assignment of ef->address.
- Don't return a Mach error number to the caller if vm_map_find() fails.
- Use ptoa() and fix style.

MFC after:	2 weeks
Sponsored by:	Netflix
This commit is contained in:
Mark Johnston 2019-10-17 21:25:50 +00:00
parent 516dc824d9
commit 092bacb2c4
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/kern/link_elf_obj.c
View File

@ -779,7 +779,6 @@ link_elf_load_file(linker_class_t cls, const char *filename,
error = ENOMEM;
goto out;
}
ef->address = (caddr_t) vm_map_min(kernel_map);
/*
* In order to satisfy amd64's architectural requirements on the
@ -794,9 +793,10 @@ link_elf_load_file(linker_class_t cls, const char *filename,
error = vm_map_find(kernel_map, ef->object, 0, &mapbase,
round_page(mapsize), 0, VMFS_OPTIMAL_SPACE, VM_PROT_ALL,
VM_PROT_ALL, 0);
if (error) {
if (error != KERN_SUCCESS) {
vm_object_deallocate(ef->object);
ef->object = 0;
ef->object = NULL;
error = ENOMEM;
goto out;
}
@ -1084,11 +1084,9 @@ link_elf_unload_file(linker_file_t file)
free(ef->relatab, M_LINKER);
free(ef->progtab, M_LINKER);
if (ef->object) {
vm_map_remove(kernel_map, (vm_offset_t) ef->address,
(vm_offset_t) ef->address +
(ef->object->size << PAGE_SHIFT));
}
if (ef->object != NULL)
vm_map_remove(kernel_map, (vm_offset_t)ef->address,
(vm_offset_t)ef->address + ptoa(ef->object->size));
free(ef->e_shdr, M_LINKER);
free(ef->ddbsymtab, M_LINKER);
free(ef->ddbstrtab, M_LINKER);